Improve input validation and error messaging

Author: kanongil

lib/index.js

@@ -38,18 +38,13 @@ internals.options = Validate.object().keys({
 });
 
 
-exports.inject = function (dispatchFunc, options) {
+exports.inject = async function (dispatchFunc, options) {      // eslint-disable-line require-await
 
     options = (typeof options === 'string' ? { url: options } : options);
 
-    if (options.validate !== false) {                                                           // Defaults to true
-        try {
-            Hoek.assert(typeof dispatchFunc === 'function', 'Invalid dispatch function');
-            Validate.assert(options, internals.options);
-        }
-        catch (err) {
-            return Promise.reject(err);
-        }
+    if (options?.validate !== false) {                                                           // Defaults to true
+        Hoek.assert(typeof dispatchFunc === 'function', 'Invalid or missing dispatch function');
+        Validate.assert(options ?? null, internals.options, 'Invalid options:');
     }
 
     return new Promise((resolve) => {

test/index.js

@@ -794,12 +794,15 @@ describe('_read()', () => {
 
     it('errors for invalid input options', async () => {
 
-        await expect(Shot.inject({}, {})).to.reject('Invalid dispatch function');
+        await expect(Shot.inject()).to.reject('Invalid or missing dispatch function');
+        await expect(Shot.inject({}, {})).to.reject('Invalid or missing dispatch function');
+        await expect(Shot.inject(Hoek.ignore)).to.reject(/^Invalid options:/);
+        await expect(Shot.inject(Hoek.ignore, true)).to.reject(/^Invalid options:/);
     });
 
     it('errors for missing url', async () => {
 
-        const err = await expect(Shot.inject((req, res) => { }, {})).to.reject();
+        const err = await expect(Shot.inject((req, res) => { }, {})).to.reject(/^Invalid options:/);
         expect(err.isJoi).to.be.true();
     });