qdone 1.6.0 → 2.0.0-alpha

package/package.json

@@ -1,42 +1,49 @@
 {
   "name": "qdone",
-  "version": "1.6.0",
+  "version": "2.0.0-alpha",
   "description": "Language agnostic job queue for SQS",
-  "main": "index.js",
+  "type": "module",
+  "main": "./index.js",
+  "module": "./index.js",
+  "bin": "./src/bin.js",
+  "files": [
+    "src",
+    "commonjs"
+  ],
   "dependencies": {
-    "aws-sdk": "^2.330.0",
-    "chalk": "^2.4.1",
-    "command-line-args": "^5.0.2",
-    "command-line-commands": "^2.0.1",
-    "command-line-usage": "5.0.5",
-    "debug": "^4.1.0",
-    "ioredis": "^4.14.0",
-    "q": "^1.5.1",
-    "tree-kill": "^1.2.0",
-    "uuid": "^3.3.2"
+    "@aws-sdk/client-cloudwatch": "^3.465.0",
+    "@aws-sdk/client-sqs": "^3.465.0",
+    "@sentry/node": "^7.87.0",
+    "chalk": "^4.1.2",
+    "command-line-args": "^5.2.1",
+    "command-line-commands": "^3.0.2",
+    "command-line-usage": "^7.0.1",
+    "debug": "^4.3.4",
+    "ioredis": "^5.3.2",
+    "standard": "^17.1.0",
+    "tree-kill": "^1.2.2",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "aws-sdk-mock": "^4.5.0",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "coveralls": "^3.0.4",
-    "mocha": "^6.1.4",
-    "mock-stdin": "^0.3.1",
-    "nyc": "^14.1.1",
-    "sinon": "^7.3.2",
-    "standard": "*",
-    "strip-ansi": "^5.0.0"
+    "aws-sdk-client-mock": "^3.0.0",
+    "aws-sdk-client-mock-jest": "^3.0.0",
+    "jest": "^29.7.0",
+    "typescript": "^5.3.3"
   },
-  "bin": "./qdone",
   "preferGlobal": true,
   "engines": {
-    "node": ">=6"
+    "node": ">=16"
   },
   "scripts": {
-    "test": "standard && nyc mocha",
+    "start": "./src/bin.js",
+    "test": "NODE_OPTIONS='--experimental-json-modules --experimental-vm-modules --no-warnings' jest",
+    "build": "tsc --allowJs index.js --outdir commonjs --esModuleInterop --module commonjs",
+    "clean": "rm -rf commonjs/src commonjs/*.js coverage",
+    "lint": "standard",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "standard": "standard",
-    "prep-for-publish": "npm shrinkwrap && echo now commit shrinkwrap and use npm run publish-{next,latest}",
+    "prepare": "pnpm run clean && pnpm run build && npm shrinkwrap",
+    "prep-for-publish": "echo now commit shrinkwrap and use npm run publish-{next,latest}",
     "publish-latest": "npm publish --tag latest",
     "publish-next": "npm publish --tag next"
   },
@@ -57,9 +64,14 @@
     "consumer",
     "amazon"
   ],
-  "greenkeeper": {
-    "ignore": [
-      "command-line-usage"
+  "jest": {
+    "testEnvironment": "jest-environment-node",
+    "transform": {}
+  },
+  "standard": {
+    "env": [
+      "jest",
+      "es6"
     ]
   },
   "bugs": {

package/src/bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env -S node --no-warnings --experimental-json-modules
+import { run } from './cli.js'
+await run(process.argv.slice(2))

package/src/cache.js

@@ -1,7 +1,7 @@
-
-const Redis = require('ioredis')
-const { URL } = require('url')
-const debug = require('debug')('qdone:cache')
+import Redis from 'ioredis'
+import { URL } from 'url'
+import Debug from 'debug'
+const debug = Debug('qdone:cache')
 
 class UsageError extends Error {}
 
@@ -11,27 +11,26 @@ let client
  * Internal function to setup redis client. Parses URI to figure out
  * how to connect.
  */
-function getClient (options) {
+export function getCacheClient (opt) {
   if (client) {
     return client
-  } else if (options['cache-uri']) {
-    const url = new URL(options['cache-uri'])
+  } else if (opt.cacheUri) {
+    const url = new URL(opt.cacheUri)
     if (url.protocol === 'redis:') {
       client = new Redis(url.toString())
     } else if (url.protocol === 'redis-cluster:') {
       url.protocol = 'redis:'
-      client = new Redis.Cluster([url.toString()], {slotsRefreshInterval: 60 * 1000})
+      client = new Redis.Cluster([url.toString()], { slotsRefreshInterval: 60 * 1000 })
     } else {
       throw new UsageError(`Only redis:// or redis-cluster:// URLs are currently supported. Got: ${url.protocol}`)
     }
-    // setTimeout(resetClient, 10000)
     return client
   } else {
     throw new UsageError('Caching requires the --cache-uri option')
   }
 }
 
-function resetClient () {
+export function shutdownCache () {
   if (client) client.quit()
   client = undefined
 }
@@ -40,27 +39,24 @@ function resetClient () {
  * Returns a promise for the item. Resolves to false if cache is empty, object
  * if it is found.
  */
-function getCache (key, options) {
-  const client = getClient(options)
-  const cacheKey = options['cache-prefix'] + key
-  debug({action: 'getCache', cacheKey})
-  return client.get(cacheKey).then(result => {
-    debug({action: 'getCache got', cacheKey, result})
-    return result ? JSON.parse(result) : undefined
-  })
+export async function getCache (key, opt) {
+  const client = getCacheClient(opt)
+  const cacheKey = opt.cachePrefix + key
+  debug({ action: 'getCache', cacheKey })
+  const result = await client.get(cacheKey)
+  debug({ action: 'getCache got', cacheKey, result })
+  return result ? JSON.parse(result) : undefined
 }
 
 /**
  * Returns a promise for the status. Encodes object as JSON
  */
-function setCache (key, value, options) {
-  const client = getClient(options)
+export async function setCache (key, value, opt) {
+  const client = getCacheClient(opt)
   const encoded = JSON.stringify(value)
-  const cacheKey = options['cache-prefix'] + key
-  debug({action: 'setCache', cacheKey, value})
-  return client.setex(cacheKey, options['cache-ttl-seconds'], encoded)
+  const cacheKey = opt.cachePrefix + key
+  debug({ action: 'setCache', cacheKey, value })
+  return client.setex(cacheKey, opt.cacheTtlSeconds, encoded)
 }
 
-module.exports = { getCache, setCache, getClient, resetClient }
-
 debug('loaded')