Adding parsing of url.query

Author: Zhen

src/v1/index.js

@@ -26,7 +26,7 @@ import Record from './record';
 import {Driver, READ, WRITE} from './driver';
 import RoutingDriver from './routing-driver';
 import VERSION from '../version';
-import {parseScheme, parseUrl} from "./internal/connector";
+import {parseScheme, parseUrl, parseRoutingContext} from "./internal/connector";
 import {assertString} from "./internal/util";
 
 
@@ -120,9 +120,14 @@ let USER_AGENT = "neo4j-javascript/" + VERSION;
 function driver(url, authToken, config = {}) {
   assertString(url, 'Bolt URL');
   const scheme = parseScheme(url);
+  const routingContext = parseRoutingContext(url);
   if (scheme === "bolt+routing://") {
-    return new RoutingDriver(parseUrl(url), USER_AGENT, authToken, config);
+    return new RoutingDriver(parseUrl(url), routingContext, USER_AGENT, authToken, config);
   } else if (scheme === "bolt://") {
+    if(routingContext.length > 0)
+    {
+      throw new Error("Routing context are not supported with scheme 'bolt'. Given URI: '" + url + "'");
+    }
     return new Driver(parseUrl(url), USER_AGENT, authToken, config);
   } else {
     throw new Error("Unknown scheme: " + scheme);

src/v1/internal/connector.js

@@ -60,10 +60,12 @@ MAGIC_PREAMBLE = 0x6060B017,
 DEBUG = false;
 
 let URLREGEX = new RegExp([
-  "([^/]+//)?",          // scheme
+  "([^/]+//)?",       // scheme
   "(([^:/?#]*)",      // hostname
   "(?::([0-9]+))?)",  // port (optional)
-  ".*"].join(""));     // everything else
+  "([^?]*)?",         // everything else
+  "(\\?(.+))?"        // query
+].join(""));
 
 function parseScheme( url ) {
   let scheme = url.match(URLREGEX)[1] || '';
@@ -82,6 +84,21 @@ function parsePort( url ) {
   return url.match( URLREGEX )[4];
 }
 
+function parseRoutingContext(url) {
+  const other = url.match(URLREGEX)[7] || '';
+  const map = {};
+  if (other.length !== 0) {
+    other.split("&").forEach(val => {
+      const keyValue = val.split("=");
+      if (keyValue.length !== 2) {
+        throw new Error("Invalid parameters: '" + keyValue + "' in url '" + url + "'.");
+      }
+      map[keyValue[0]] = keyValue[1];
+    });
+  }
+  return map;
+}
+
 /**
  * Very rudimentary log handling, should probably be replaced by something proper at some point.
  * @param actor the part that sent the message, 'S' for server and 'C' for client
@@ -495,5 +512,6 @@ export {
     parseUrl,
     parseHost,
     parsePort,
+    parseRoutingContext,
     Connection
 }

src/v1/routing-driver.js

@@ -27,7 +27,7 @@ import {LoadBalancer} from './internal/connection-providers';
  */
 class RoutingDriver extends Driver {
 
-  constructor(url, userAgent, token = {}, config = {}) {
+  constructor(url, routingContext, userAgent, token = {}, config = {}) {
     super(url, userAgent, token, RoutingDriver._validateConfig(config));
   }
 

test/internal/host-name-resolvers.test.js

@@ -19,7 +19,38 @@
 
 import {DnsHostNameResolver, DummyHostNameResolver} from '../../src/v1/internal/host-name-resolvers';
 import hasFeature from '../../src/v1/internal/features';
-import {parseHost, parsePort, parseScheme} from '../../src/v1/internal/connector';
+import {parseHost, parsePort, parseScheme, parseRoutingContext} from '../../src/v1/internal/connector';
+
+fdescribe('RoutingContextParser', ()=>{
+
+  it('should parse routing context', done => {
+    const url = "bolt://localhost:7687/cat?name=molly&age=1&color=white";
+    const context = parseRoutingContext(url);
+    expect(context).toEqual({name:"molly", age:"1", color:"white"});
+
+    done();
+  });
+
+  it('should return empty routing context', done =>{
+    const url1 = "bolt://localhost:7687/cat?";
+    const context1 = parseRoutingContext(url1);
+    expect(context1).toEqual({});
+
+    const url2 = "bolt://localhost:7687/lalala";
+    const context2 = parseRoutingContext(url2);
+    expect(context2).toEqual({});
+
+    done();
+  });
+
+  it('should error for unmatched pair', done=>{
+    const url = "bolt://localhost?cat";
+    expect(()=>parseRoutingContext(url)).toThrow(
+      new Error("Invalid parameters: 'cat' in url 'bolt://localhost?cat'."));
+
+    done();
+  });
+});
 
 describe('DummyHostNameResolver', () => {