2396190794

Build # 2396190794

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/chrvadala/node-ble/commit/<a class=hub.com/chrvadala/node-ble/commit/2a6107a2fd5e17fefa11f815766fd2ed38420562">2a6107a2f<a href="https://github.com/chrvadala/node-ble/commit/2a6107a2fd5e17fefa11f815766fd2ed38420562">">Merge </a><a class="double-link" href="https://github.com/chrvadala/node-ble/commit/<a class="double-link" href="https://github.com/chrvadala/node-ble/commit/fca927bb8775874e31858cfbc9f4720fb5f749c4">fca927bb8</a>">fca927bb8</a><a href="https://github.com/chrvadala/node-ble/commit/2a6107a2fd5e17fefa11f815766fd2ed38420562"> into eb20e9c32">eb20e9c32</a>

Pull Request Pull Request #37: Extend listener removal in BusHelper

Run Details

54 of 65 branches covered (83.08%)

Branch coverage included in aggregate %.

1 of 4 new or added lines in 2 files covered. (25.0%)

245 of 252 relevant lines covered (97.22%)

6.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

91.3

/src/BusHelper.js

const EventEmitter = require('events')

const DEFAULT_OPTIONS = {
  useProps: true,
  usePropsEvents: false
}

class BusHelper extends EventEmitter {
  constructor (dbus, service, object, iface, options = {}) {
    super()

    this.service = service
    this.object = object
    this.iface = iface

    this.dbus = dbus

    this.options = {
      ...DEFAULT_OPTIONS,
      ...options
    }

    this._ready = false
    this._objectProxy = null
    this._ifaceProxy = null
    this._propsProxy = null
  }

  async _prepare () {
    if (this._ready) return
    const objectProxy = this._objectProxy = await this.dbus.getProxyObject(this.service, this.object)
    this._ifaceProxy = await objectProxy.getInterface(this.iface)

    if (this.options.useProps) {
      this._propsProxy = await objectProxy.getInterface('org.freedesktop.DBus.Properties')
    }

    if (this.options.useProps && this.options.usePropsEvents) {
      this._propsProxy.on('PropertiesChanged', (iface, changedProps, invalidated) => {
        if (iface === this.iface) {
          this.emit('PropertiesChanged', changedProps)
        }
      })
    }

    this._ready = true
  }

  async props () {
    if (!this.options.useProps) throw new Error('props not available')
    await this._prepare()
    const rawProps = await this._propsProxy.GetAll(this.iface)
    const props = {}
    for (const propKey in rawProps) {
      props[propKey] = rawProps[propKey].value
    }
    return props
  }

  async prop (propName) {
    if (!this.options.useProps) throw new Error('props not available')
    await this._prepare()
    const rawProp = await this._propsProxy.Get(this.iface, propName)
    return rawProp.value
  }

  async set (propName, value) {
    if (!this.options.useProps) throw new Error('props not available')
    await this._prepare()
    await this._propsProxy.Set(this.iface, propName, value)
  }

  async waitPropChange (propName) {
    await this._prepare()
    return new Promise((resolve) => {
      const cb = (iface, changedProps, invalidated) => {
        // console.log('changed props on %s -> %o', iface, changedProps)

        if (!(iface === this.iface && (propName in changedProps))) return

        resolve(changedProps[propName].value)
        this._propsProxy.off('PropertiesChanged', cb)
      }

      this._propsProxy.on('PropertiesChanged', cb)
    })
  }

  async children () {
    this._ready = false // WORKAROUND: it forces to construct a new ProxyObject
    await this._prepare()
    return BusHelper.buildChildren(this.object, this._objectProxy.nodes)
  }

  async callMethod (methodName, ...args) {
    await this._prepare()
    return this._ifaceProxy[methodName](...args)
  }

  removeListeners () {
    this.removeAllListeners('PropertiesChanged')
    if (this._propsProxy !== null) {
      this._propsProxy.removeAllListeners('PropertiesChanged')
    }
  }

  static buildChildren (path, nodes) {
    if (path === '/') path = ''
    const children = new Set()
    for (const node of nodes) {
      if (!node.startsWith(path)) continue

      const end = node.indexOf('/', path.length + 1)
      const sub = (end >= 0) ? node.substring(path.length + 1, end) : node.substring(path.length + 1)
      if (sub.length < 1) continue

      children.add(sub)
    }
    return Array.from(children.values())
  }
}

module.exports = BusHelper

1	const EventEmitter = require('events')	10✔
2
3	const DEFAULT_OPTIONS = {	10✔
4	useProps: true,
5	usePropsEvents: false
6	}
7
8	class BusHelper extends EventEmitter {
9	constructor (dbus, service, object, iface, options = {}) {	8✔
10	super()	12✔
11
12	this.service = service	12✔
13	this.object = object	12✔
14	this.iface = iface	12✔
15
16	this.dbus = dbus	12✔
17
18	this.options = {	12✔
19	...DEFAULT_OPTIONS,
20	...options
21	}
22
23	this._ready = false	12✔
24	this._objectProxy = null	12✔
25	this._ifaceProxy = null	12✔
26	this._propsProxy = null	12✔
27	}
28
29	async _prepare () {
30	if (this._ready) return	24✔
31	const objectProxy = this._objectProxy = await this.dbus.getProxyObject(this.service, this.object)	14✔
32	this._ifaceProxy = await objectProxy.getInterface(this.iface)	14✔
33
34	if (this.options.useProps) {	14✔
35	this._propsProxy = await objectProxy.getInterface('org.freedesktop.DBus.Properties')	12✔
36	}
37
38	if (this.options.useProps && this.options.usePropsEvents) {	14✔
39	this._propsProxy.on('PropertiesChanged', (iface, changedProps, invalidated) => {	2✔
40	if (iface === this.iface) {	2!
41	this.emit('PropertiesChanged', changedProps)	2✔
42	}
43	})
44	}
45
46	this._ready = true	14✔
47	}
48
49	async props () {
50	if (!this.options.useProps) throw new Error('props not available')	4✔
51	await this._prepare()	2✔
52	const rawProps = await this._propsProxy.GetAll(this.iface)	2✔
53	const props = {}	2✔
54	for (const propKey in rawProps) {	2✔
55	props[propKey] = rawProps[propKey].value	4✔
56	}
57	return props	2✔
58	}
59
60	async prop (propName) {
61	if (!this.options.useProps) throw new Error('props not available')	6✔
62	await this._prepare()	4✔
63	const rawProp = await this._propsProxy.Get(this.iface, propName)	4✔
64	return rawProp.value	4✔
65	}
66
67	async set (propName, value) {
68	if (!this.options.useProps) throw new Error('props not available')	8!
69	await this._prepare()	8✔
70	await this._propsProxy.Set(this.iface, propName, value)	8✔
71	}
72
73	async waitPropChange (propName) {
74	await this._prepare()	4✔
75	return new Promise((resolve) => {	4✔
76	const cb = (iface, changedProps, invalidated) => {	4✔
77	// console.log('changed props on %s -> %o', iface, changedProps)
78
79	if (!(iface === this.iface && (propName in changedProps))) return	8!
80
81	resolve(changedProps[propName].value)	8✔
82	this._propsProxy.off('PropertiesChanged', cb)	8✔
83	}
84
85	this._propsProxy.on('PropertiesChanged', cb)	4✔
86	})
87	}
88
89	async children () {
90	this._ready = false // WORKAROUND: it forces to construct a new ProxyObject	2✔
91	await this._prepare()	2✔
92	return BusHelper.buildChildren(this.object, this._objectProxy.nodes)	2✔
93	}
94
95	async callMethod (methodName, ...args) {
96	await this._prepare()	4✔
97	return this._ifaceProxy[methodName](...args)	4✔
98	}
99
100	removeListeners () {
NEW 101	this.removeAllListeners('PropertiesChanged')	×
NEW 102	if (this._propsProxy !== null) {	×
NEW 103	this._propsProxy.removeAllListeners('PropertiesChanged')	×
104	}
105	}
106
107	static buildChildren (path, nodes) {
108	if (path === '/') path = ''	10✔
109	const children = new Set()	10✔
110	for (const node of nodes) {	10✔
111	if (!node.startsWith(path)) continue	44✔
112
113	const end = node.indexOf('/', path.length + 1)	28✔
114	const sub = (end >= 0) ? node.substring(path.length + 1, end) : node.substring(path.length + 1)	28✔
115	if (sub.length < 1) continue	28✔
116
117	children.add(sub)	26✔
118	}
119	return Array.from(children.values())	10✔
120	}
121	}
122
123	module.exports = BusHelper	10✔

chrvadala / node-ble / 2396190794

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous