fixed deno bolt agent

Author: ConorNeo

packages/bolt-connection/test/bolt/bolt-protocol-v5x2.test.js

@@ -295,6 +295,39 @@ describe('#unit BoltProtocolV5x2', () => {
     expect(protocol.flushes).toEqual([false, true])
   })
 
+  it('should set userAgent to bolt agent when userAgent is null', () => {
+    const recorder = new utils.MessageRecordingConnection()
+    const protocol = new BoltProtocolV5x2(recorder, null, false)
+    utils.spyProtocolWrite(protocol)
+
+    const clientName = 'js-driver/1.2.3'
+    const authToken = { username: 'neo4j', password: 'secret' }
+
+    const observer = protocol.initialize({ userAgent: null, boltAgent: clientName, authToken })
+
+    protocol.verifyMessageCount(2)
+    expect(protocol.messages[0]).toBeMessage(
+      RequestMessage.hello5x1(clientName)
+    )
+    expect(protocol.messages[1]).toBeMessage(
+      RequestMessage.logon(authToken)
+    )
+
+    expect(protocol.observers.length).toBe(2)
+
+    // hello observer
+    const helloObserver = protocol.observers[0]
+    expect(helloObserver).toBeInstanceOf(LoginObserver)
+    expect(helloObserver).not.toBe(observer)
+
+    // login observer
+    const loginObserver = protocol.observers[1]
+    expect(loginObserver).toBeInstanceOf(LoginObserver)
+    expect(loginObserver).toBe(observer)
+
+    expect(protocol.flushes).toEqual([false, true])
+  })
+
   it.each(
     [true, false]
   )('should logon to the server [flush=%s]', (flush) => {

packages/core/src/internal/bolt-agent/browser/bolt-agent.ts

@@ -16,6 +16,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+/* eslint-disable */
 export function fromVersion (version: string): string {
-  return `neo4j-javascript/${version} (browser)}`
+  // @ts-ignore: browser code so must be skipped by ts
+  const APP_VERSION = window.navigator.appVersion
+
+  //APP_VERSION looks like 5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36
+  const OS = APP_VERSION.split(" ")[0];
+
+  return `neo4j-javascript/${version} ${OS} `
 }
+/* eslint-enable */

packages/core/src/internal/bolt-agent/deno/bolt-agent.ts

@@ -16,6 +16,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
+/* eslint-disable */
 export function fromVersion (version: string): string {
-  return `neo4j-javascript/${version} (browser)`
+  const HOST_ARCH = Deno.build.arch
+  const DENO_VERSION = `Deno/${Deno.version.deno}`
+  const NODE_V8_VERSION = Deno.version.v8
+  const OS_NAME_VERSION = `${Deno.build.os} ${Deno.osRelease}`
+
+  return `neo4j-javascript/${version} (${OS_NAME_VERSION}; ${HOST_ARCH}) ${DENO_VERSION} (v8 ${NODE_V8_VERSION})`
 }
+/* eslint-enable */

packages/core/src/internal/bolt-agent/node/bolt-agent.ts

@@ -22,23 +22,7 @@ export function fromVersion (version: string): string {
   const HOST_ARCH = process.config.variables.host_arch
   const NODE_VERSION = 'Node/' + process.versions.node
   const NODE_V8_VERSION = process.versions.v8
+  const OS_NAME_VERSION = `${os.platform()} ${os.release()}`
 
-  const osName = mapOs(os.platform())
-
-  return `neo4j-javascript/${version} (${osName} ${os.release()}; ${HOST_ARCH}) ${NODE_VERSION} (v8 ${NODE_V8_VERSION})`
-}
-
-export function mapOs (osType: string): string {
-  let osName
-  if (osType === 'darwin') {
-    osName = 'MacOS'
-  } else if (osType === 'win32') {
-    osName = 'Windows'
-  } else if (osType === 'linux') {
-    osName = 'Linux'
-  } else {
-    osName = osType
-  }
-
-  return osName
+  return `neo4j-javascript/${version} (${OS_NAME_VERSION}; ${HOST_ARCH}) ${NODE_VERSION} (v8 ${NODE_V8_VERSION})`
 }

packages/core/tsconfig.build.json

@@ -2,5 +2,8 @@
   "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts",
+  ],
+  "exclude": [
+    "src/internal/bolt-agent/deno/*.ts"
   ]
 }

packages/core/tsconfig.json

@@ -16,5 +16,5 @@
   "include": [
     "src/**/*.ts",
     "test/**/*.ts"
-  ]
+  ],
 }

packages/neo4j-driver-deno/generate.ts

@@ -132,8 +132,6 @@ async function copyAndTransform(inDir: string, outDir: string) {
       // Special fix for core/internal/bolt-agent/index.js
       // Replace the "node boltAgent" with the "deno boltAgent", since Deno supports different APIs
       if(inPath.endsWith("bolt-agent/index.ts")){
-        console.log(inPath)
-        console.log(contents)
         contents = contents.replace(
             `export * from './node/index.ts'`,
             `export * from './deno/index.ts'`,
@@ -143,8 +141,6 @@ async function copyAndTransform(inDir: string, outDir: string) {
       // Special fix for bolt-connection/channel/index.js and core/internal/bolt-agent/index.js
       // Replace the "node channel" with the "deno channel", since Deno supports different APIs
       if (inPath.endsWith("channel/index.js")) {
-        console.log(inPath)
-        console.log(contents)
         contents = contents.replace(
           `export * from './node/index.js'`,
           `export * from './deno/index.js'`,

packages/neo4j-driver-deno/lib/core/internal/bolt-agent/browser/bolt-agent.ts

@@ -17,5 +17,7 @@
 * limitations under the License.
 */
 export function fromVersion (version: string): string {
+  window.navagator
+
   return `neo4j-javascript/${version} (browser)}`
 }

packages/neo4j-driver-deno/lib/core/internal/bolt-agent/deno/bolt-agent.ts

@@ -16,6 +16,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
 export function fromVersion (version: string): string {
-  return `neo4j-javascript/${version} (browser)`
+  const HOST_ARCH = Deno.build.arch
+  const DENO_VERSION = 'Deno/' + Deno.version.deno
+  const NODE_V8_VERSION = Deno.version.v8
+  const OS_NAME_VERSION = `${Deno.build.os} ${Deno.osRelease}`
+
+  return `neo4j-javascript/${version} (${OS_NAME_VERSION}; ${HOST_ARCH}) ${DENO_VERSION} (v8 ${NODE_V8_VERSION})`
 }

packages/neo4j-driver-deno/lib/core/internal/bolt-agent/node/bolt-agent.ts

@@ -22,23 +22,7 @@ export function fromVersion (version: string): string {
   const HOST_ARCH = process.config.variables.host_arch
   const NODE_VERSION = 'Node/' + process.versions.node
   const NODE_V8_VERSION = process.versions.v8
+  const OS_NAME_VERSION = `${os.platform()} ${os.release()}`
 
-  const osName = mapOs(os.platform())
-
-  return `neo4j-javascript/${version} (${osName} ${os.release()}; ${HOST_ARCH}) ${NODE_VERSION} (v8 ${NODE_V8_VERSION})`
-}
-
-export function mapOs (osType: string): string {
-  let osName
-  if (osType === 'darwin') {
-    osName = 'MacOS'
-  } else if (osType === 'win32') {
-    osName = 'Windows'
-  } else if (osType === 'linux') {
-    osName = 'Linux'
-  } else {
-    osName = osType
-  }
-
-  return osName
-}
+  return `neo4j-javascript/${version} (${OS_NAME_VERSION}; ${HOST_ARCH}) ${NODE_VERSION} (v8 ${NODE_V8_VERSION})`
+}