presidium 3.3.1 → 3.3.3

package/GoogleChromeDevTools.js

@@ -12,7 +12,7 @@ function getId() {
  *
  * @docs
  * ```coffeescript [specscript]
- * sendRequestJSON(payload string) -> data Promise<Object>
+ * sendRequestJSON(payload object) -> data Promise<Object>
  * ```
  */
 async function sendRequestJSON(payload) {
@@ -23,18 +23,18 @@ async function sendRequestJSON(payload) {
 
   const handler = function (message) {
     const data = JSON.parse(message.toString('utf8'))
-    if (data.id == id) {
+    if (data.id == payload.id) {
       resolve(data)
     }
   }
 
   this.websocket.on('message', handler)
-  this.websocket.send(payload)
+  this.websocket.send(JSON.stringify(payload))
 
   const data = await promise
   this.websocket.removeListener('message', handler)
 
-  return data.result
+  return data
 }
 
 /**
@@ -51,12 +51,12 @@ async function sendRequestJSON(payload) {
 async function _Method(method, { sessionId, ...params }) {
   const id = getId()
 
-  const payload = JSON.stringify({
+  const payload = {
     sessionId: sessionId ?? this.sessionId,
     id,
     method,
     params,
-  })
+  }
 
   const data = await sendRequestJSON.call(this, payload)
 
@@ -66,7 +66,7 @@ async function _Method(method, { sessionId, ...params }) {
     throw error
   }
 
-  return data
+  return data.result
 }
 
 class GoogleChromeDevToolsTarget {
@@ -371,6 +371,7 @@ class GoogleChromeDevToolsDOM {
    * DOM.describeNode(options {
    *   sessionId: string,
    *   nodeId: string,
+   *   depth: number,
    * }) -> data Promise<{
    *   node: CDPDOM.Node,
    * }>
@@ -382,6 +383,7 @@ class GoogleChromeDevToolsDOM {
    *   * `options`
    *     * `sessionId` - the session ID.
    *     * `nodeId` - the ID of the node to describe.
+   *     * `depth` - the maximum depth of the subtree. Defaults to `1`. Use `-1` for the entire subtree.
    *
    * Return:
    *   * `data`
@@ -1052,6 +1054,7 @@ class GoogleChromeDevTools extends EventEmitter {
     })
     await this.googleChromeForTesting.init()
 
+    console.log('initializing websocket with devtoolsUrl:', this.googleChromeForTesting.devtoolsUrl)
     this.websocket = new WebSocket(this.googleChromeForTesting.devtoolsUrl, {
       offerPerMessageDeflate: false,
     })

package/GoogleChromeForTesting.js

@@ -267,8 +267,12 @@ class GoogleChromeForTesting {
     const devtoolsUrlPromise = new Promise(_resolve => {
       devtoolsUrlResolve = _resolve
     })
-    cmd.stderr.on('data', chunk => {
-      const line = chunk.toString('utf8').trim()
+
+    const rl = readline.createInterface({
+      input: cmd.stderr,
+    })
+
+    rl.on('line', line => {
       if (line.includes('DevTools listening on')) {
         const devtoolsUrl = line.replace('DevTools listening on ', '')
         devtoolsUrlResolve(devtoolsUrl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",