Release v2.0.6

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [ push ]
+on: [ push, pull_request ]
 
 env:
   CI: true

.github/workflows/publish.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+    paths:
+      - package.json
 
 env:
   CI: true

.gitignore

@@ -37,3 +37,9 @@ jspm_packages
 .node_repl_history
 
 package-lock.json
+bower_components
+# Optional npm cache directory
+.npmrc
+.idea
+.DS_Store
+haraka-update.sh

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".release"]
+	path = .release
+	url = [email protected]:msimerson/.release.git

.npmignore

@@ -1,14 +1,58 @@
-.github
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+package-lock.json
+bower_components
+# Optional npm cache directory
+.npmrc
+.idea
 .DS_Store
+haraka-update.sh
+
+.github
+.release
+.codeclimate.yml
 .editorconfig
 .gitignore
 .gitmodules
 .lgtm.yml
-http/bower_components
-http/node_modules
-.travis.yml
 appveyor.yml
+codecov.yml
+.travis.yml
 .eslintrc.yaml
 .eslintrc.json
-codecov.yml
-.codeclimate.yml

Changes.md

@@ -1,4 +1,12 @@
 
+### Unreleased
+
+
+### [2.0.6] - 2023-12-12
+
+- doc(README): '[socket]' is now '[server]' (#39)
+- chore(ci): add .release, updated dot files
+
 
 ### 2.0.5 - 2022-05-26
 
@@ -83,3 +91,4 @@
 
 - don't break when no [redis] config exists
 
+[2.0.6]: https://github.com/haraka/haraka-plugin-redis/releases/tag/2.0.6

index.js

@@ -150,6 +150,7 @@ exports.redis_ping = async function () {
     const r = await this.db.ping()
     if (r !== 'PONG') throw new Error('not PONG');
     this.redis_pings=true
+
     return true
 }
 
@@ -193,6 +194,7 @@ exports.get_redis_client = async function (opts) {
     }
 }
 
+
 exports.get_redis_pub_channel = function (conn) {
     return `result-${conn.transaction ? conn.transaction.uuid : conn.uuid}`;
 }
@@ -201,18 +203,20 @@ exports.get_redis_sub_channel = function (conn) {
     return `result-${conn.uuid}*`;
 }
 
-exports.redis_subscribe_pattern = async function (pattern) {
+// formerly used by pi-watch
+exports.redis_subscribe_pattern = async function (pattern, onMessage) {
 
     if (this.redis) return // already subscribed?
 
     this.redis = redis.createClient(this.redisCfg.pubsub)
     await this.redis.connect()
 
-    await this.redis.pSubscribe(pattern);
+    await this.redis.pSubscribe(pattern, onMessage);
     this.logdebug(this, `pSubscribed to ${pattern}`);
 }
 
-exports.redis_subscribe = async function (connection) {
+// the next two functions are use by pi-karma
+exports.redis_subscribe = async function (connection, onMessage) {
 
     if (connection.notes.redis) {
         connection.logdebug(this, `redis already subscribed`);
@@ -229,7 +233,7 @@ exports.redis_subscribe = async function (connection) {
     clearTimeout(timer);
 
     const pattern = this.get_redis_sub_channel(connection)
-    connection.notes.redis.pSubscribe(pattern);
+    connection.notes.redis.pSubscribe(pattern, onMessage);
     connection.logdebug(this, `pSubscribed to ${pattern}`);
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "haraka-plugin-redis",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Redis plugin for Haraka & other plugins to inherit from",
   "main": "index.js",
   "directories": {