refactor(database): Several classes and utility methods

Author: jsayol

src/database/api/Database.ts

@@ -15,13 +15,8 @@ import { RepoInfo } from '../core/RepoInfo';
  * @implements {FirebaseService}
  */
 export class Database implements FirebaseService {
-  /** @type {Reference} */
-  private root_: Reference;
-
-  /** @type {DatabaseInternals} */
   INTERNAL: DatabaseInternals;
-
-  app: FirebaseApp | null;
+  private root_: Reference;
 
   static readonly ServerValue = {
     'TIMESTAMP': {
@@ -108,8 +103,7 @@ export class Database implements FirebaseService {
   }
 }
 
-class DatabaseInternals {
-  database
+export class DatabaseInternals {
   /** @param {!Database} database */
   constructor(public database: Database) {
   }

src/database/core/RepoInfo.ts

@@ -6,7 +6,7 @@ import { LONG_POLLING, WEBSOCKET } from '../realtime/Constants';
 
 /**
  * A class that holds metadata about a Repo object
- * 
+ *
  * @constructor
  */
 export class RepoInfo {

src/database/core/SparseSnapshotTree.ts

@@ -34,7 +34,7 @@ export class SparseSnapshotTree {
       const childKey = path.getFront();
       path = path.popFront();
       if (this.children_.contains(childKey)) {
-        const childTree = this.children_.get(childKey) as SparseSnapshotTree;
+        const childTree = <SparseSnapshotTree>this.children_.get(childKey) as SparseSnapshotTree;
         return childTree.find(path);
       } else {
         return null;
@@ -67,7 +67,7 @@ export class SparseSnapshotTree {
         this.children_.add(childKey, new SparseSnapshotTree());
       }
 
-      const child = this.children_.get(childKey) as SparseSnapshotTree;
+      const child = <SparseSnapshotTree>this.children_.get(childKey) as SparseSnapshotTree;
       path = path.popFront();
       child.remember(path, data);
     }

src/database/core/SyncTree.ts

@@ -521,7 +521,7 @@ export class SyncTree {
           let queries: Query[] = [];
           if (maybeChildSyncPoint) {
             queries = queries.concat(
-              maybeChildSyncPoint.getQueryViews().map(view => view.getQuery())
+                maybeChildSyncPoint.getQueryViews().map(view=> view.getQuery())
             );
           }
           forEach(childMap, function (key: string, childQueries: Query[]) {

src/database/core/WriteTree.ts

@@ -239,7 +239,7 @@ export class WriteTree {
    * @return {!ChildrenNode}
    */
   calcCompleteEventChildren(treePath: Path, completeServerChildren: ChildrenNode | null) {
-    let completeChildren = ChildrenNode.EMPTY_NODE as Node;
+    let completeChildren = <Node>ChildrenNode.EMPTY_NODE as Node;
     const topLevelSet = this.visibleWrites_.getCompleteNode(treePath);
     if (topLevelSet) {
       if (!topLevelSet.isLeafNode()) {
@@ -385,8 +385,8 @@ export class WriteTree {
     if (!toIterate.isEmpty() && !toIterate.isLeafNode()) {
       const nodes = [];
       const cmp = index.getCompare();
-      const iter = reverse ? (toIterate as ChildrenNode).getReverseIteratorFrom(startPost, index) :
-        (toIterate as ChildrenNode).getIteratorFrom(startPost, index);
+      const iter = reverse ? (toIterateas ChildrenNode).getReverseIteratorFrom(startPost, index) :
+          (toIterateas ChildrenNode).getIteratorFrom(startPost, index);
       let next = iter.getNext();
       while (next && nodes.length < count) {
         if (cmp(next, startPost) !== 0) {
@@ -563,7 +563,7 @@ export class WriteTreeRef {
    * @return {!ChildrenNode}
    */
   calcCompleteEventChildren(completeServerChildren: ChildrenNode | null): ChildrenNode {
-    return this.writeTree_.calcCompleteEventChildren(this.treePath_, completeServerChildren) as ChildrenNode;
+    return <ChildrenNode>this.writeTree_.calcCompleteEventChildren(this.treePath_, completeServerChildren) as ChildrenNode;
   }
 
   /**

src/database/core/util/CountedSet.ts

@@ -29,14 +29,14 @@ export class CountedSet<K, V> {
    * @return {V}
    */
   get(item: K): V | void {
-    return this.contains(item) ? this.set[item as any] : undefined;
+    return this.contains(item) ? this.set[<any>item as any] : undefined;
   }
 
   /**
    * @param {!K} item
    */
   remove(item: K) {
-    delete this.set[item as any];
+    delete this.set[<any>item as any];
   }
 
   /**

src/database/core/util/Path.ts

@@ -40,7 +40,7 @@ export class Path {
 
       this.pieceNum_ = 0;
     } else {
-      this.pieces_ = pathOrString as string[];
+      this.pieces_ = <string[]>pathOrString as string[];
       this.pieceNum_ = pieceNum;
     }
   }

src/database/core/util/SortedMap.ts

@@ -83,7 +83,7 @@ export class SortedMapIterator<K, V, T> {
     if (this.resultGenerator_)
       result = this.resultGenerator_(node.key, node.value);
     else
-      result = {key: node.key, value: node.value} as any;
+      result = <any>{key: node.key, value: node.value} as any;
 
     if (this.isReverse_) {
       node = node.left;
@@ -114,7 +114,7 @@ export class SortedMapIterator<K, V, T> {
     if (this.resultGenerator_) {
       return this.resultGenerator_(node.key, node.value);
     } else {
-      return {key: node.key, value: node.value} as any;
+      return <any>{key: node.key, value: node.value} as any;
     }
   }
 }
@@ -303,7 +303,7 @@ export class LLRBNode<K, V> {
         } else {
           smallest = (n.right as LLRBNode<K,V>).min_();
           n = n.copy(smallest.key, smallest.value, null, null,
-            (n.right as LLRBNode<K,V>).removeMin_());
+                     (n.rightas LLRBNode<K,V>).removeMin_());
         }
       }
       n = n.copy(null, null, null, null, n.right.remove(key, comparator));
@@ -364,7 +364,7 @@ export class LLRBNode<K, V> {
    */
   private rotateLeft_(): LLRBNode<K,V> {
     const nl = this.copy(null, null, LLRBNode.RED, null, this.right.left);
-    return this.right.copy(null, null, this.color, nl, null) as LLRBNode<K,V>;
+    return <LLRBNode<K,V>>this.right.copy(null, null, this.color, nl, null) as LLRBNode<K,V>;
   }
 
   /**
@@ -373,7 +373,7 @@ export class LLRBNode<K, V> {
    */
   private rotateRight_(): LLRBNode<K,V> {
     const nr = this.copy(null, null, LLRBNode.RED, this.left.right, null);
-    return this.left.copy(null, null, this.color, null, nr) as LLRBNode<K,V>;
+    return <LLRBNode<K,V>>this.left.copy(null, null, this.color, null, nr) as LLRBNode<K,V>;
   }
 
   /**

src/database/core/util/util.ts

@@ -240,9 +240,9 @@ export const warnAboutUnsupportedMethod = function (methodName: string) {
  */
 export const isInvalidJSONNumber = function (data: any): boolean {
   return typeof data === 'number' &&
-    (data != data || // NaN
-      data == Number.POSITIVE_INFINITY ||
-      data == Number.NEGATIVE_INFINITY);
+      (data != data || // NaN
+       data == Number.POSITIVE_INFINITY ||
+       data == Number.NEGATIVE_INFINITY);
 };
 
 

src/database/realtime/Connection.ts

@@ -121,7 +121,7 @@ export class Connection {
 
     const healthyTimeout_ms = conn['healthyTimeout'] || 0;
     if (healthyTimeout_ms > 0) {
-      this.healthyTimeout_ = setTimeoutNonBlocking(() => {
+      this.healthyTimeout_ = <number><any>setTimeoutNonBlocking(() => {
         this.healthyTimeout_ = null;
         if (!this.isHealthy_) {
           if (this.conn_ && this.conn_.bytesReceived > BYTES_RECEIVED_HEALTHY_OVERRIDE) {
@@ -199,7 +199,7 @@ export class Connection {
 
   private onSecondaryControl_(controlData: { [k: string]: any }) {
     if (MESSAGE_TYPE in controlData) {
-      const cmd = controlData[MESSAGE_TYPE] as string;
+      const cmd: string = controlData[MESSAGE_TYPE] as string;
       if (cmd === SWITCH_ACK) {
         this.upgradeIfSecondaryHealthy_();
       } else if (cmd === CONTROL_RESET) {
@@ -292,7 +292,7 @@ export class Connection {
   private onControl_(controlData: { [k: string]: any }) {
     const cmd: string = requireKey(MESSAGE_TYPE, controlData);
     if (MESSAGE_DATA in controlData) {
-      const payload = controlData[MESSAGE_DATA];
+      const payload: any = controlData[MESSAGE_DATA];
       if (cmd === SERVER_HELLO) {
         this.onHandshake_(payload);
       } else if (cmd === END_TRANSMISSION) {

src/database/realtime/Transport.ts

@@ -52,4 +52,10 @@ export abstract class Transport {
   abstract send(data: Object): void;
 
   abstract markConnectionHealthy(): void;
+
+  abstract markConnectionHealthy();
+}
+
+export interface TransportConstructor {
+  new(connId: string, RepoInfo, transportSessionId?: string, lastSessionId?: string);
 }

src/database/realtime/WebSocketConnection.ts

@@ -273,7 +273,7 @@ export class WebSocketConnection implements Transport {
   handleIncomingFrame(mess: { [k: string]: any }) {
     if (this.mySock === null)
       return; // Chrome apparently delivers incoming packets even after we .close() the connection sometimes.
-    const data = mess['data'] as string;
+    const data: string = mess['data'] as string;
     this.bytesReceived += data.length;
     this.stats_.incrementCounter('bytes_received', data.length);
 
@@ -362,7 +362,7 @@ export class WebSocketConnection implements Transport {
    */
   resetKeepAlive() {
     clearInterval(this.keepaliveTimer);
-    this.keepaliveTimer = setInterval(() => {
+    this.keepaliveTimer = <number><any>setInterval(() => {
       //If there has been no websocket activity for a while, send a no-op
       if (this.mySock) {
         this.sendString_('0');