feat(Xapi#_watchEvents): keep-alive, inject 1 event per minute (#45)

See vatesfr/xo-web#1384

packages/xen-api/src/index.js

@@ -13,8 +13,7 @@ import { EventEmitter } from 'events'
 import {
   catchPlus as pCatch,
   delay as pDelay,
-  promisify,
+  promisify
-  timeout as pTimeout
 } from 'promise-toolbox'
 import {
   createClient as createXmlRpcClient,
@@ -401,10 +400,9 @@ export class Xapi extends EventEmitter {
 
   // Medium level call: handle session errors.
   _sessionCall (method, args) {
+    try {
       if (startsWith(method, 'session.')) {
-      return Promise.reject(
+        throw new Error('session.*() methods are disabled from this interface')
-        new Error('session.*() methods are disabled from this interface')
-      )
       }
 
       return this._transportCall(method, [this.sessionId].concat(args))
@@ -416,6 +414,9 @@ export class Xapi extends EventEmitter {
           this._sessionId = null
           return this.connect().then(() => this._sessionCall(method, args))
         })
+    } catch (error) {
+      return Promise.reject(error)
+    }
   }
 
   // Low level call: handle transport errors.
@@ -611,13 +612,25 @@ export class Xapi extends EventEmitter {
   }
 
   _watchEvents () {
-    const call = () => this._sessionCall('event.from', [
+    const injectEvent = () => {
+      const { pool } = this
+      if (pool) {
+        this._sessionCall('event.inject', [ 'pool', pool.$ref ]).catch(console.error)
+      }
+    }
+
+    let timeout
+    const loop = () => {
+      // Keep alive: force at least one event per minute.
+      clearTimeout(timeout)
+      timeout = setTimeout(injectEvent, 60e3)
+
+      return this._sessionCall('event.from', [
         ['*'],
         this._fromToken,
         1e3 + 0.1 // Force float.
-    ])::pTimeout(600000, call)
+      ]).then(onSuccess, onFailure)
-
+    }
-    const loop = () => call().then(onSuccess, onFailure)
 
     const onSuccess = ({token, events}) => {
       this._fromToken = token