Master

Author: schmidt-sebastian

packages/database/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+- [changed] Internal cleanup to Node.JS support.
+
+# 6.4.0
 - [fixed] Fixed an issue that caused `.info/serverTimeOffset` events not to fire (#2043).
 - [changed] Treat `ns` url query parameter as the default Realtime Database
   namespace name.

packages/database/index.node.ts

@@ -25,10 +25,13 @@ import { enableLogging } from './src/core/util/util';
 import { RepoManager } from './src/core/RepoManager';
 import * as INTERNAL from './src/api/internal';
 import * as TEST_ACCESS from './src/api/test_access';
-import './src/nodePatches';
 import * as types from '@firebase/database-types';
 import { setSDKVersion } from './src/core/version';
 import { CONSTANTS, isNodeSdk } from '@firebase/util';
+import { setWebSocketImpl } from './src/realtime/WebSocketConnection';
+import { Client } from 'faye-websocket';
+
+setWebSocketImpl(Client);
 
 const ServerValue = Database.ServerValue;
 

packages/database/package.json

@@ -16,7 +16,7 @@
     "test": "yarn test:emulator",
     "test:all": "run-p test:browser test:node",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/nodePatches.ts --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --opts ../../config/mocha.node.opts",
     "test:emulator": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/database-test-runner.ts",
     "prepare": "yarn build"
   },

packages/database/src/nodePatches.ts

@@ -209,7 +209,6 @@ export class BrowserPollConnection implements Transport {
         urlParams[LAST_SESSION_PARAM] = this.lastSessionId;
       }
       if (
-        !isNodeSdk() &&
         typeof location !== 'undefined' &&
         location.href &&
         location.href.indexOf(FORGE_DOMAIN) !== -1
@@ -252,17 +251,21 @@ export class BrowserPollConnection implements Transport {
 
   // Static method, use string literal so it can be accessed in a generic way
   static isAvailable() {
-    // NOTE: In React-Native there's normally no 'document', but if you debug a React-Native app in
-    // the Chrome debugger, 'document' is defined, but document.createElement is null (2015/06/08).
-    return (
-      BrowserPollConnection.forceAllow_ ||
-      (!BrowserPollConnection.forceDisallow_ &&
+    if (isNodeSdk()) {
+      return false;
+    } else if (BrowserPollConnection.forceAllow_) {
+      return true;
+    } else {
+      // NOTE: In React-Native there's normally no 'document', but if you debug a React-Native app in
+      // the Chrome debugger, 'document' is defined, but document.createElement is null (2015/06/08).
+      return (
+        !BrowserPollConnection.forceDisallow_ &&
         typeof document !== 'undefined' &&
         document.createElement != null &&
         !isChromeExtensionContentScript() &&
-        !isWindowsStoreApp() &&
-        !isNodeSdk())
-    );
+        !isWindowsStoreApp()
+      );
+    }
   }
 
   /**
@@ -542,15 +545,6 @@ export class FirebaseIFrameScriptHolder {
       }, Math.floor(0));
     }
 
-    if (isNodeSdk() && this.myID) {
-      const urlParams: { [k: string]: string } = {};
-      urlParams[FIREBASE_LONGPOLL_DISCONN_FRAME_PARAM] = 't';
-      urlParams[FIREBASE_LONGPOLL_ID_PARAM] = this.myID;
-      urlParams[FIREBASE_LONGPOLL_PW_PARAM] = this.myPW;
-      const theURL = this.urlFn(urlParams);
-      (FirebaseIFrameScriptHolder as any).nodeRestRequest(theURL);
-    }
-
     // Protect from being called recursively.
     const onDisconnect = this.onDisconnect;
     if (onDisconnect) {

packages/database/src/realtime/BrowserPollConnection.ts

@@ -1271,9 +1271,7 @@ export class IndexedDbLruDelegate implements ReferenceDelegate, LruDelegate {
     txn: PersistenceTransaction,
     queryData: QueryData
   ): PersistencePromise<void> {
-    const updated = queryData.copy({
-      sequenceNumber: txn.currentSequenceNumber
-    });
+    const updated = queryData.withSequenceNumber(txn.currentSequenceNumber);
     return this.db.getQueryCache().updateQueryData(txn, updated);
   }
 

packages/firestore/src/local/indexeddb_persistence.ts

@@ -481,10 +481,10 @@ export class LocalStore {
             const resumeToken = change.resumeToken;
             // Update the resume token if the change includes one.
             if (resumeToken.length > 0) {
-              const newQueryData = oldQueryData.copy({
+              const newQueryData = oldQueryData.withResumeToken(
                 resumeToken,
-                snapshotVersion: remoteVersion
-              });
+                remoteVersion
+              );
               this.queryDataByTarget[targetId] = newQueryData;
 
               // Update the query data if there are target changes (or if

packages/firestore/src/local/local_store.ts

@@ -435,9 +435,7 @@ export class MemoryLruDelegate implements ReferenceDelegate, LruDelegate {
     txn: PersistenceTransaction,
     queryData: QueryData
   ): PersistencePromise<void> {
-    const updated = queryData.copy({
-      sequenceNumber: txn.currentSequenceNumber
-    });
+    const updated = queryData.withSequenceNumber(txn.currentSequenceNumber);
     return this.persistence.getQueryCache().updateQueryData(txn, updated);
   }
 

packages/firestore/src/local/memory_persistence.ts

@@ -61,28 +61,33 @@ export class QueryData {
     readonly resumeToken: ProtoByteString = emptyByteString()
   ) {}
 
+  /** Creates a new query data instance with an updated sequence number. */
+  withSequenceNumber(sequenceNumber: number): QueryData {
+    return new QueryData(
+      this.query,
+      this.targetId,
+      this.purpose,
+      sequenceNumber,
+      this.snapshotVersion,
+      this.resumeToken
+    );
+  }
+
   /**
-   * Creates a new query data instance with an updated snapshot version and
-   * resume token.
+   * Creates a new query data instance with an updated resume token and
+   * snapshot version.
    */
-  copy(overwrite: {
-    resumeToken?: ProtoByteString;
-    snapshotVersion?: SnapshotVersion;
-    sequenceNumber?: ListenSequenceNumber;
-  }): QueryData {
+  withResumeToken(
+    resumeToken: ProtoByteString,
+    snapshotVersion: SnapshotVersion
+  ): QueryData {
     return new QueryData(
       this.query,
       this.targetId,
       this.purpose,
-      overwrite.sequenceNumber === undefined
-        ? this.sequenceNumber
-        : overwrite.sequenceNumber,
-      overwrite.snapshotVersion === undefined
-        ? this.snapshotVersion
-        : overwrite.snapshotVersion,
-      overwrite.resumeToken === undefined
-        ? this.resumeToken
-        : overwrite.resumeToken
+      this.sequenceNumber,
+      snapshotVersion,
+      resumeToken
     );
   }