remove legacy code

collapse dkim sign/verify to a single field

Changes.md

@@ -1,32 +1,43 @@
 
-1.0.6 - 2017-01-25
+### 1.0.7 - 2017-03-31
 
-    - plugins w/o pass results are now light grey (was light green)
+- add default config/watch.ini file 
+- add config section to README
+- add repo badges
+- remove legacy "walk the connection/transaction to find results" code
+- replace some function () { calls with arrow functions
+- handle smtp_forward recipient validation results
+- collapse dkim sign/verify to a single field
 
-1.0.5 - 2017-01-24
+### 1.0.6 - 2017-01-25
 
-    - added plugin known-senders
-    - removed grunt
+- plugins w/o pass results are now light grey (was light green)
 
-1.0.4 - 2017-01-01
-    - lint fixes
+### 1.0.5 - 2017-01-24
 
-1.0.3 - 2016-10-25
+- added plugin known-senders
+- removed grunt
 
-    - set logs URLs to open in new browser window
+### 1.0.4 - 2017-01-01
 
-Oct 23 22:23:57 2016
+- lint fixes
 
-    - add new names of plugins published to npm
+### 1.0.3 - 2016-10-25
 
-Oct 10 20:26:45 2016
+- set logs URLs to open in new browser window
 
-    - enable more data plugins by default
+### Oct 23 22:23:57 2016
 
-Oct 10 19:33:41 2016
+- add new names of plugins published to npm
 
-    - add start of test suite
+### Oct 10 20:26:45 2016
 
-Oct 8 23:28:07 2016
+- enable more data plugins by default
 
-    - initial import
+### Oct 10 19:33:41 2016
+
+- add start of test suite
+
+### Oct 8 23:28:07 2016
+
+- initial import

README.md

@@ -1,6 +1,10 @@
 # watch
 
-[![Greenkeeper badge](https://badges.greenkeeper.io/haraka/haraka-plugin-watch.svg)](https://greenkeeper.io/)
+[![Build Status][ci-img]][ci-url]
+[![Build status][ci-win-img]][ci-win-url]
+[![Greenkeeper badge][gk-img]][gk-url]
+[![NPM][npm-img]][npm-url]
+
 
 Watch live SMTP traffic in a web interface.
 
@@ -33,3 +37,25 @@ details.
 * Light red: tests failed, but no rejection
 * Red: tests failed causing rejection
 
+## Config
+
+Config options are set in watch.ini.
+
+* sampling: boolean, limit display connections to one-per-second
+* wss.url: specify the WSS url (default: same scheme, host, port as http)
+* wss.htdocs: an alternate docroot (default ./html)
+
+## Troubleshooting
+
+* If you aren't getting activity, make sure your web browser is able to establish the websockets connection. Either use straight http (only) or have a valid signed TLS certificate. The security for websockets connections is more strict than plain HTTP(s).
+
+
+[ci-img]: https://travis-ci.org/haraka/haraka-plugin-watch.svg?branch=master
+[ci-url]: https://travis-ci.org/haraka/haraka-plugin-watch
+[ci-win-img]: https://ci.appveyor.com/api/projects/status/yxjfxu5mb4n94ho3?svg=true
+[ci-win-url]: https://ci.appveyor.com/project/msimerson/haraka-plugin-watch
+[gk-img]: https://badges.greenkeeper.io/haraka/haraka-plugin-watch.svg
+[gk-url]: https://greenkeeper.io/
+[npm-img]: https://nodei.co/npm/haraka-plugin-watch.png
+[npm-url]: https://www.npmjs.com/package/haraka-plugin-watch
+

config/watch.ini

@@ -0,0 +1,10 @@
+
+;sampling=false
+
+[wss]
+;url=ws://mail.example.com/
+;url=wss://mail.example.com/
+;
+; the default htdocs is ./html. If you customize the interface, you
+; can specify the alternate location here.
+;htdocs=/var/www/html

html/client.js

@@ -11,14 +11,17 @@ var total_cols;
 var cxn_cols;
 var txn_cols;
 
-var connect_plugins  = ['geoip','asn','p0f','dnsbl', 'early_talker', 'fcrdns'];
+var connect_plugins  = ['geoip','asn','p0f','dnsbl', 'access', 'fcrdns'];
 var helo_plugins     = ['helo.checks', 'tls', 'auth', 'relay', 'spf'];
 var mail_from_plugins= ['spf', 'mail_from.is_resolvable', 'known-senders'];
-var rcpt_to_plugins  = ['access', 'rcpt_to.in_host_list', 'rcpt_to.qmail_deliverable'];
+var rcpt_to_plugins  = [
+  'queue/smtp_forward',
+  'rcpt_to.in_host_list',
+  'rcpt_to.qmail_deliverable'
+];
 var data_plugins     = [
-  'bounce','data.headers','karma','spamassassin','rspamd',
-  'clamd','avg','data.uribl','limit','dkim_sign','dkim_verify',
-  'attachment'
+  'early_talker', 'bounce','data.headers','karma','spamassassin','rspamd',
+  'clamd','avg','data.uribl','limit','dkim','attachment'
 ];
 // 'seen' plugins are ones we've seen data reported for. When data from a new
 // plugin arrives, it gets added to one of the sections above and the table is
@@ -364,8 +367,10 @@ function shorten_pi (name) {
     'rcpt_to.qmail_deliverable': 'qmd',
     'rcpt_to.in_host_list': 'host_list',
     'mail_from.is_resolvable': 'dns',
-    'dkim_verify' : 'dkim',
     'known-senders' : 'known',
+    'queue/smtp_forward': 'forward',
+    'smtp_forward': 'forward',
+    'attachment': 'attach'
   };
   if (trims[name]) return trims[name];