@sera4/essentia 1.1.65 → 1.1.66

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.65",
+  "version": "1.1.66",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "NODE_ENV=test ./node_modules/.bin/mocha --forbid-only --reporter mocha-junit-reporter --reporter-options mochaFile=./test-results/result.xml --exit",
-    "test:dev": "NODE_ENV=test ./node_modules/.bin/mocha --forbid-only",
-    "test:only": "NODE_ENV=test ./node_modules/.bin/mocha --watch",
-    "test:pretty": "NODE_ENV=test ./node_modules/.bin/mocha --reporter mocha-simple-html-reporter --reporter-options output=./test-results/result.html --exit",
-    "last-commit": "node last-commit.js"
+    "test": "NODE_ENV=test NODE_OPTIONS='--no-experimental-require-module' ./node_modules/.bin/mocha --forbid-only --reporter mocha-junit-reporter --reporter-options mochaFile=./test-results/result.xml --exit",
+    "test:dev": "NODE_ENV=test NODE_OPTIONS='--no-experimental-require-module' ./node_modules/.bin/mocha --forbid-only",
+    "test:only": "NODE_ENV=test NODE_OPTIONS='--no-experimental-require-module' ./node_modules/.bin/mocha --watch",
+    "test:pretty": "NODE_ENV=test NODE_OPTIONS='--no-experimental-require-module' ./node_modules/.bin/mocha --reporter mocha-simple-html-reporter --reporter-options output=./test-results/result.html --exit",
+    "build": "echo 'no build step'",
+    "last-commit": "node last-commit.js",
+    "publish:package": "scripts/publish.sh"
   },
   "author": "Dev DM <dev@sera4.com>",
   "repository": {
@@ -18,7 +20,7 @@
   },
   "license": "UNLICENSED",
   "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^5.0.0",
     "express": "^4.17.1",
     "mocha": "^11.1.0",
     "mocha-junit-reporter": "^2.2.1",
@@ -27,7 +29,7 @@
     "sinon": "^5.1.1"
   },
   "dependencies": {
-    "amqplib": "^0.8.0",
+    "amqplib": "^0.10.9",
     "argparse": "^2.0.1",
     "async": "^3.2.2",
     "axios": "^1.7.7",

package/paper-trail/index.js

@@ -1,4 +1,5 @@
-import * as jsdiff from 'diff';
+import { createRequire } from 'module';
+const jsdiff = createRequire(import.meta.url)('diff');
 import _ from 'lodash';
 import helpers from './helpers.js';
 import paginator from "../paginator/sql-pagination.js";

package/queue/index.js

@@ -1,5 +1,5 @@
 "use strict";
-import amqp from "amqplib/callback_api.js";
+import amqp from "amqplib";
 import logger from "./queue-logger.js";
 import urlParse from "url-parse";
 import { Publisher } from "./publisher.js";
@@ -11,6 +11,7 @@ import { Subscriber } from "./subscriber.js";
 class S4Queue {
   constructor() {
     this.connection = null;
+    this.connectionTestChannel = null;
     this.retry = 10;
     this.pubs = {};
     this.subs = {};
@@ -30,15 +31,20 @@ class S4Queue {
   async testConnection() {
     if (!this.isConnected()) {
       this.connectionTestChannel = null;
-      throw("queue service not connected")
+      throw new Error("queue service not connected");
     }
 
-    this.connectionTestChannel = this.connectionTestChannel || await this.connection.createChannel();
     if (!this.connectionTestChannel) {
-      throw("queue service failed to obtain a channel")
+      const ch = await this.connection.createChannel();
+      if (!ch) {
+        throw new Error("queue service failed to obtain a channel");
+      }
+      ch.on("error", () => { this.connectionTestChannel = null; });
+      ch.on("close", () => { this.connectionTestChannel = null; });
+      this.connectionTestChannel = ch;
     }
 
-    await this.connectionTestChannel.assertExchange("--health-check--", "topic", {durable: false});
+    await this.connectionTestChannel.assertExchange("--health-check--", "topic", { durable: false });
   }
 
   /**
@@ -56,60 +62,51 @@ class S4Queue {
     const retry = parseInt(options.retryInterval);
     this.retry = retry || 10;
 
-    logger.debug("Attempting connection...");
+    // 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 };
 
-    // The docs say there is amqp.connect returning
-    // a promise, but this version doesn't seem to like
-    // when a callback isn't provided, therefore run
-    // in a new Promise
-    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};
+    return new Promise((resolve) => {
+      const attempt = async () => {
+        logger.debug("Attempting connection...");
+        try {
+          const conn = await amqp.connect(options.connectionUrl, socketOptions);
 
-      amqp.connect(options.connectionUrl, socketOptions, (err, conn) => {
+          this.connection = conn;
+          this.updatePubsAndSubsConnectionRef(conn);
 
-        if (err) {
-          logger.error("Error while connecting", err)
+          this.connection.on("error", (err) => {
+            logger.error("connection error", err);
+            // Do not attempt to reconnect as the
+            // 'close' event will also be emitted
+            // if this error closes the connection
+          });
+
+          this.connection.on("close", (err) => {
+            logger.error("connection closed");
+            this.connection = null;
+            this.connectionTestChannel = null;
+            if (err) {
+              logger.error("connection closed due to error:", err);
+              logger.error("Reconnecting in", this.retry, "seconds");
+              setTimeout(attempt, this.retry * 1000);
+            } else {
+              logger.debug("Will not re-attempt");
+            }
+          });
+
+          logger.debug("Connected");
+          resolve();
+        } catch (err) {
+          logger.error("Error while connecting", err);
           logger.error("Attempting again in", this.retry, "seconds");
-          return setTimeout(() => this.openConnection(options), this.retry * 1000);
+          setTimeout(attempt, this.retry * 1000);
         }
-
-        this.connection = conn;
-        if (!this.connection) {
-          return reject(new Error("Failed to obtain connection"));
-        } else {
-          this.updatePubsAndSubsConnectionRef(conn);
-        }
-
-        this.connection.on("error", (err) => {
-          logger.error("connection error", err);
-          // Do not attempt to reconnect as the
-          // 'close' event will also be emitted
-          // if this error closes the connection
-        });
-
-        this.connection.on("close", (err) => {
-          logger.error("connection closed");
-          this.connection = null;
-          if (err) {
-            logger.error("connection closed due to error:", err);
-            logger.error("Reconnecting in", this.retry, "seconds");
-            setTimeout(() => this.openConnection(options), this.retry * 1000);
-          } else {
-            // If there was no error, it is us who closed
-            // this connection, thus a reconnection will not
-            // be attempted.
-            logger.debug("Will not re-attempt");
-          }
-        });
-
-        logger.debug("Connected");
-        resolve();
-      });
+      };
+      attempt();
     });
   }
 
@@ -119,21 +116,12 @@ class S4Queue {
    * and subscribers
    */
   async closeConnection() {
-    return new Promise((resolve, reject) => {
-      if (!this.connection) {
-        return resolve();
-      }
-      this.connection.close((err) => {
-        if (err) {
-          reject(err);
-        } else {
-          this.subs = {};
-          this.pubs = {};
-          this.connection = null;
-          resolve();
-        }
-      });
-    });
+    if (!this.connection) return;
+    await this.connection.close();
+    this.subs = {};
+    this.pubs = {};
+    this.connectionTestChannel = null;
+    this.connection = null;
   }
 
   /**

package/scripts/publish.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+
+# ── Version resolution ────────────────────────────────────────────────────────
+VERSION="${BUILD_VERSION:-}"
+
+if [ -z "$VERSION" ]; then
+  VERSION=$(node -p "require('./package.json').version")
+fi
+
+if [ -z "$VERSION" ] || [ "$VERSION" = "0.0.0" ]; then
+  echo "error: no version specified — set BUILD_VERSION or package.json version" >&2
+  exit 1
+fi
+
+PACKAGE=$(node -p "require('./package.json').name")
+echo "publishing $PACKAGE@$VERSION"
+
+# ── Stamp version, restore on exit ───────────────────────────────────────────
+ORIGINAL_VERSION=$(node -p "require('./package.json').version")
+restore_version() {
+  npm pkg set version="$ORIGINAL_VERSION" --silent
+}
+trap restore_version EXIT
+
+npm pkg set version="$VERSION" --silent
+
+# ── Build ─────────────────────────────────────────────────────────────────────
+echo "building..."
+npm run build
+
+# ── Dist-tag: prerelease versions get 'next', stable versions get 'latest' ───
+if [[ "$VERSION" =~ -[a-zA-Z] ]]; then
+  DIST_TAG="next"
+else
+  DIST_TAG="latest"
+fi
+
+# ── Publish ───────────────────────────────────────────────────────────────────
+echo "publishing with tag: $DIST_TAG"
+npm publish --access public --tag "$DIST_TAG"
+
+echo "done: $PACKAGE@$VERSION"