@sera4/essentia 1.0.30 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "scripts": {

package/queue/index.js

@@ -17,35 +17,27 @@ class S4Queue {
   }
 
   /**
-   * Opens a connection and immediately closes it.
-   * To be used for health checks.
-   * @param {Object} options Connection parameters. At the very least options.connectionUrl must be present.
+   * Tests the connection to the service.
+   * Internally, the same connection is used for test
+   * and production code, but a separate channel is opened.
+   * Once the channel is obtained, there is an assert on the
+   * existence of a topic exchange called '--health-check--'.
+   * The following must be satisfied for the test to pass
+   * 1. must be connected
+   * 2. must have a test channel
+   * 3. must assert the exchange
    */
-  async testConnection(options) {
-    return new Promise((resolve, reject) => {
-      // We may run into issues with SNI TLS if
-      // we host with 3rd parties using our own certs.
-      // To avoid any issues, let's parse the url
-      // and provide the server name in the socket options
-      const urlParts = urlParse(options.connectionUrl);
-      const socketOptions = {servername: urlParts.hostname};
+  async testConnection() {
+    if (!this.isConnected()) {
+      throw("queue service not connected")
+    }
 
-      amqp.connect(options.connectionUrl, socketOptions, (err, conn) => {
-        if (err) {
-          return reject(err);
-        }
-        if (!conn) {
-          return reject("Failed to obtain connection");
-        }
-        conn.close(e => {
-          if (e) {
-            reject(e)
-          } else {
-            resolve(true)
-          }
-        })
-      });
-    });
+    this.connectionTestChannel = this.connectionTestChannel || await this.connection.createChannel();
+    if (!this.connectionTestChannel) {
+      throw("queue service failed to obtain a channel")
+    }
+
+    await this.connectionTestChannel.assertExchange("--health-check--", "topic", {durable: false});
   }
 
   /**