qdone 2.0.50-alpha → 2.0.51-alpha

package/commonjs/src/monitor.js

@@ -10,14 +10,17 @@ exports.getAggregateData = exports.interpretWildcard = exports.monitor = void 0;
 const sqs_js_1 = require("./sqs.js");
 const cloudWatch_js_1 = require("./cloudWatch.js");
 const defaults_js_1 = require("./defaults.js");
+const qrlCache_js_1 = require("./qrlCache.js");
 const debug_1 = __importDefault(require("debug"));
-const debug = (0, debug_1.default)('sd:utils:qmonitor:index');
+const debug = (0, debug_1.default)('qdone:monitor');
 /**
  * Splits a queue name with a single wildcard into prefix and suffix regex.
  */
 async function monitor(queue, save, options) {
     const opt = (0, defaults_js_1.getOptionsWithDefaults)(options);
-    const data = await getAggregateData(queue);
+    const queueName = (0, qrlCache_js_1.normalizeQueueName)(queue, opt);
+    debug({ opt, queueName });
+    const data = await getAggregateData(queueName);
     console.log(data);
     if (save) {
         if (opt.verbose)

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "qdone",
-  "version": "2.0.50-alpha",
+  "version": "2.0.51-alpha",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "qdone",
-      "version": "2.0.50-alpha",
+      "version": "2.0.51-alpha",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-cloudwatch": "3.465.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdone",
-  "version": "2.0.50-alpha",
+  "version": "2.0.51-alpha",
   "description": "A distributed scheduler for SQS",
   "type": "module",
   "main": "./index.js",

package/src/cli.js

@@ -234,16 +234,8 @@ export async function monitor (argv) {
 
   // Load module after AWS global load
   setupAWS(options)
-  const { getAggregateData } = await import('./monitor.js')
-  const { putAggregateData } = await import('./cloudWatch.js')
-  const data = await getAggregateData(queue)
-  console.log(data)
-  if (options.save) {
-    process.stderr.write('Saving to CloudWatch...')
-    await putAggregateData(data)
-    process.stderr.write('done\n')
-  }
-  return data
+  const { monitor } = await import('./monitor.js')
+  return monitor(queue, options.save, options)
 }
 
 export async function loadBatchFile (filename) {

package/src/monitor.js

@@ -5,15 +5,18 @@
 import { getMatchingQueues, getQueueAttributes } from './sqs.js'
 import { putAggregateData } from './cloudWatch.js'
 import { getOptionsWithDefaults } from './defaults.js'
+import { normalizeQueueName } from './qrlCache.js'
 import Debug from 'debug'
-const debug = Debug('sd:utils:qmonitor:index')
+const debug = Debug('qdone:monitor')
 
 /**
  * Splits a queue name with a single wildcard into prefix and suffix regex.
  */
 export async function monitor (queue, save, options) {
   const opt = getOptionsWithDefaults(options)
-  const data = await getAggregateData(queue)
+  const queueName = normalizeQueueName(queue, opt)
+  debug({ opt, queueName })
+  const data = await getAggregateData(queueName)
   console.log(data)
   if (save) {
     if (opt.verbose) process.stderr.write('Saving to CloudWatch...')