@weave-js/core 0.10.0 → 0.12.0

package/lib/metrics/exporter/event.js

@@ -1,41 +1,41 @@
-const { createBaseMetricAdapter } = require('./base')
+const { createBaseMetricAdapter } = require('./base');
 
 module.exports = (options) => {
-  const lastChanges = new Set()
+  const lastChanges = new Set();
 
-  const adapter = createBaseMetricAdapter(options)
+  const adapter = createBaseMetricAdapter(options);
 
   const sendEvent = (registry, options) => {
-    const broker = registry.broker
-    const list = this.registry.list()
+    const broker = registry.broker;
+    const list = this.registry.list();
 
-    broker.emit(this.options.eventName, list)
+    broker.emit(this.options.eventName, list);
 
-    lastChanges.clear()
-  }
+    lastChanges.clear();
+  };
 
   adapter.init = (registry) => {
     this.options = Object.assign(options, {
       eventName: '$metrics.changed',
       interval: 5000
-    })
+    });
 
-    this.registry = registry
+    this.registry = registry;
 
     if (this.options.interval > 0) {
-      this.timer = setInterval(() => sendEvent(), this.options.interval)
-      this.timer.unref()
+      this.timer = setInterval(() => sendEvent(), this.options.interval);
+      this.timer.unref();
     }
-  }
+  };
 
   adapter.stop = () => {
-    clearInterval(this.timer)
-    return Promise.resolve()
-  }
+    clearInterval(this.timer);
+    return Promise.resolve();
+  };
 
   adapter.metricChanged = (metric) => {
-    lastChanges.add(metric)
-  }
+    lastChanges.add(metric);
+  };
 
-  return adapter
-}
+  return adapter;
+};

package/lib/metrics/exporter/index.js

@@ -1,44 +1,44 @@
-const { isString, isFunction } = require('@weave-js/utils')
-const { WeaveBrokerOptionsError } = require('../../errors')
+const { isString, isFunction } = require('@weave-js/utils');
+const { WeaveBrokerOptionsError } = require('../../errors');
 
 const adapters = {
   Base: require('./base'),
   Event: require('./event')
-}
+};
 
 const getByName = name => {
   if (!name) {
-    return null
+    return null;
   }
 
-  const n = Object.keys(adapters).find(n => n.toLowerCase() === name.toLowerCase())
+  const n = Object.keys(adapters).find(n => n.toLowerCase() === name.toLowerCase());
 
   if (n) {
-    return adapters[n]
+    return adapters[n];
   }
-}
+};
 
 module.exports = {
   ...adapters,
   resolve (options) {
-    let cacheFactory
+    let cacheFactory;
 
     if (options === true) {
-      cacheFactory = this.adapters.Event
+      cacheFactory = this.adapters.Event;
     } else if (isString(options)) {
-      const cache = getByName(options)
+      const cache = getByName(options);
 
       if (cache) {
-        cacheFactory = cache
+        cacheFactory = cache;
       } else {
-        throw new WeaveBrokerOptionsError(`Unknown metric adapter: "${options}"`)
+        throw new WeaveBrokerOptionsError(`Unknown metric adapter: "${options}"`);
       }
     } else if (isFunction(options)) {
-      cacheFactory = options
+      cacheFactory = options;
     }
 
     if (cacheFactory) {
-      return cacheFactory
+      return cacheFactory;
     }
   }
-}
+};

package/lib/metrics/index.js

@@ -1,2 +1,2 @@
-exports.Constants = require('./constants')
-exports.Exporter = require('./exporter')
+exports.Constants = require('./constants');
+exports.Exporter = require('./exporter');

package/lib/metrics/types/base.js

@@ -6,39 +6,39 @@ exports.createBaseMetricType = (metricRegistry, obj) => {
     labels: obj.labels || [],
     type: obj.type,
     unit: obj.unit
-  })
+  });
 
   base.stringifyLabels = (labels) => {
     if (base.labels.length === 0 || labels === null || typeof labels !== 'object') {
-      return ''
+      return '';
     }
 
-    const parts = []
+    const parts = [];
 
     base.labels.forEach(labelName => {
-      const value = labels[labelName]
+      const value = labels[labelName];
       if (typeof value === 'number') {
-        parts.push(value)
+        parts.push(value);
       } else if (typeof value === 'string') {
-        parts.push(value)
+        parts.push(value);
       } else if (typeof value === 'boolean') {
-        parts.push('' + value)
+        parts.push('' + value);
       } else {
-        parts.push('')
+        parts.push('');
       }
-    })
+    });
 
-    return parts.join('|')
-  }
+    return parts.join('|');
+  };
 
   base.get = (labels) => {
-    const labelString = base.stringifyLabels(labels)
-    return base.values.get(labelString)
-  }
+    const labelString = base.stringifyLabels(labels);
+    return base.values.get(labelString);
+  };
 
   base.snapshot = () => {
-    return base.generateSnapshot()
-  }
+    return base.generateSnapshot();
+  };
 
   base.toObject = () => {
     return {
@@ -47,8 +47,8 @@ exports.createBaseMetricType = (metricRegistry, obj) => {
       description: base.description,
       value: base.snapshot(),
       unit: base.unit
-    }
-  }
+    };
+  };
 
-  return base
-}
+  return base;
+};

package/lib/metrics/types/counter.js

@@ -1,11 +1,11 @@
-const { createGauge } = require('./gauge')
+const { createGauge } = require('./gauge');
 
 exports.createCounter = (metricRegistry, obj) => {
-  const base = createGauge(metricRegistry, obj)
+  const base = createGauge(metricRegistry, obj);
 
   base.decrement = () => {
-    throw new Error('Not allowed to decrement a counter')
-  }
+    throw new Error('Not allowed to decrement a counter');
+  };
 
-  return base
-}
+  return base;
+};

package/lib/metrics/types/gauge.js

@@ -1,19 +1,19 @@
-const { createBaseMetricType } = require('./base')
+const { createBaseMetricType } = require('./base');
 
 exports.createGauge = (registry, obj) => {
-  const base = createBaseMetricType(registry, obj)
+  const base = createBaseMetricType(registry, obj);
 
-  base.value = 0
+  base.value = 0;
 
   base.increment = (labels, value, timestamp) => {
-    const item = base.values.get(labels)
-    base.set((item ? item.value : 0) + value, labels, timestamp)
-  }
+    const item = base.get(labels);
+    base.set((item ? item.value : 0) + value, labels, timestamp);
+  };
 
   base.decrement = (labels, value, timestamp) => {
-    const item = base.get(labels)
-    base.set((item ? item.value : 0) - value, labels, timestamp)
-  }
+    const item = base.get(labels);
+    base.set((item ? item.value : 0) - value, labels, timestamp);
+  };
 
   base.generateSnapshot = () => {
     return Array.from(base.values)
@@ -21,33 +21,33 @@ exports.createGauge = (registry, obj) => {
         return {
           value: item.value,
           labels: item.labels
-        }
-      })
-  }
+        };
+      });
+  };
 
   base.set = (value, labels, timestamp = Date.now()) => {
-    const labelString = base.stringifyLabels(labels)
-    let item = base.values.get(labelString)
+    const labelString = base.stringifyLabels(labels);
+    let item = base.values.get(labelString);
 
-    base.value = value
+    base.value = value;
 
     if (item) {
       if (item.value !== value) {
-        item.labels = labels
-        item.value = value
-        item.timestamp = timestamp
+        item.labels = labels;
+        item.value = value;
+        item.timestamp = timestamp;
       }
     } else {
       item = {
         labels,
         value,
         timestamp
-      }
+      };
 
-      base.values.set(labelString, item)
+      base.values.set(labelString, item);
     }
-    return item
-  }
+    return item;
+  };
 
-  return base
-}
+  return base;
+};

package/lib/metrics/types/histogram.js

@@ -1,34 +1,34 @@
-const { createBaseMetricType } = require('./base')
+const { createBaseMetricType } = require('./base');
 
 exports.createHistogram = (registry, obj) => {
-  const base = createBaseMetricType(registry, obj)
+  const base = createBaseMetricType(registry, obj);
 
-  base.value = 0
+  base.value = 0;
 
   // create default buckets
   if (obj.buckets) {
-    base.buckets = registry.options.defaultBuckets
+    base.buckets = registry.options.defaultBuckets;
   }
 
-  base.buckets = base.buckets.sort((a, b) => a - b)
+  base.buckets = base.buckets.sort((a, b) => a - b);
 
   base.observe = (value, labels, timestamp) => {
-    const labelString = base.stringifyLabels(labels)
+    const labelString = base.stringifyLabels(labels);
 
-    const item = base.values.get(labelString)
+    const item = base.values.get(labelString);
 
     if (!value) {
 
     }
 
-    base.set(labels, (item ? item.value : 0) + value)
-  }
+    base.set(labels, (item ? item.value : 0) + value);
+  };
 
   base.decrement = (labels, value, timestamp) => {
-    const item = base.get(labels)
+    const item = base.get(labels);
 
-    base.set(labels, (item ? item.value : 0) - value)
-  }
+    base.set(labels, (item ? item.value : 0) - value);
+  };
 
   base.generateSnapshot = () => {
     return Array.from(base.values)
@@ -36,32 +36,32 @@ exports.createHistogram = (registry, obj) => {
         return {
           value: item.value,
           labels: item.labels
-        }
-      })
-  }
+        };
+      });
+  };
 
   base.set = (labels, value, timestamp) => {
-    const labelString = base.stringifyLabels(labels)
-    const item = base.values.get(labelString)
+    const labelString = base.stringifyLabels(labels);
+    const item = base.values.get(labelString);
 
-    base.value = value
+    base.value = value;
 
     if (item) {
       if (item.value !== value) {
-        item.labels = labels
-        item.value = value
+        item.labels = labels;
+        item.value = value;
       }
     } else {
       const item = {
         labels: labels,
         value: value
-      }
+      };
 
-      base.values.set(labelString, item)
+      base.values.set(labelString, item);
     }
-    return item
-  }
+    return item;
+  };
 
-  return base
-}
+  return base;
+};
 

package/lib/metrics/types/index.js

@@ -2,18 +2,18 @@ const types = {
   Counter: require('./counter').createCounter,
   Gauge: require('./gauge').createGauge,
   Info: require('./info').createInfo
-}
+};
 
 const getByName = name => {
-  const n = Object.keys(types).find(i => i.toLocaleLowerCase() === name.toLocaleLowerCase())
+  const n = Object.keys(types).find(i => i.toLocaleLowerCase() === name.toLocaleLowerCase());
 
   if (n) {
-    return types[n]
+    return types[n];
   }
-}
+};
 
 module.exports = {
   resolve (type) {
-    return getByName(type)
+    return getByName(type);
   }
-}
+};

package/lib/metrics/types/info.js

@@ -1,7 +1,7 @@
-const { createBaseMetricType } = require('./base')
+const { createBaseMetricType } = require('./base');
 
 exports.createInfo = (metricRegistry, obj) => {
-  const base = createBaseMetricType(metricRegistry, obj)
+  const base = createBaseMetricType(metricRegistry, obj);
 
   base.generateSnapshot = () => {
     return Array.from(base.values)
@@ -9,33 +9,33 @@ exports.createInfo = (metricRegistry, obj) => {
         return {
           value: item.value,
           labels: item.labels
-        }
-      })
-  }
+        };
+      });
+  };
 
   base.set = (value, labels, timestamp) => {
-    const labelString = base.stringifyLabels(labels)
-    const item = base.values.get(labelString)
+    const labelString = base.stringifyLabels(labels);
+    const item = base.values.get(labelString);
 
-    base.value = value
+    base.value = value;
 
     if (item) {
       if (item.value !== value) {
-        item.labels = labels
-        item.value = value
-        item.timestamp = timestamp || Date.now()
+        item.labels = labels;
+        item.value = value;
+        item.timestamp = timestamp || Date.now();
       }
     } else {
       const item = {
         labels: labels,
         value: value,
         timestamp: timestamp || Date.now()
-      }
+      };
 
-      base.values.set(labelString, item)
+      base.values.set(labelString, item);
     }
-    return item
-  }
+    return item;
+  };
 
-  return base
-}
+  return base;
+};

package/lib/middlewares/action-hooks/index.js

@@ -1,90 +1,138 @@
 /*
- * Author: Kevin Ries (kevin@fachw3rk.de)
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
  * -----
  * Copyright 2021 Fachwerk
  */
 
 function callHook (hook, service, context, result) {
   if (typeof hook === 'function') {
-    return hook.call(service, context, result)
+    return hook.call(service, context, result);
   } else if (Array.isArray(hook)) {
-    return hook.reduce((promise, fn) => promise.then(res => fn.call(service, context, res)), Promise.resolve(result))
+    return hook.reduce(
+      (promise, fn) => promise.then(res => fn.call(service, context, res)),
+      Promise.resolve(result));
+  }
+}
+
+function callErrorHook (hook, service, context, error) {
+  if (typeof hook === 'function') {
+    return hook.call(service, context, error);
+  } else if (Array.isArray(hook)) {
+    return hook.reduce(
+      (promise, fn) => promise.catch(err => fn.call(service, context, err)),
+      Promise.reject(error));
   }
 }
 
 function sanitizeHooks (hooks, service) {
   if (typeof hooks === 'string') {
-    hooks = hooks.split(' ')
+    hooks = hooks.split(' ');
   }
 
   if (Array.isArray(hooks)) {
     return hooks.map((hook) => {
+      // resolve the method name
       if (typeof hook === 'string') {
-        return (service && typeof service[hook] === 'function') ? service[hook] : null
+        return (service && typeof service[hook] === 'function') ? service[hook] : null;
       }
-      return hook
-    })
+      return hook;
+    });
   }
-  return hooks
+  return hooks;
 }
 
 const makeActionHookMiddleware = function (handler, action) {
-  const name = action.shortName
-  const hooks = (action.service && action.service.schema) ? action.service.schema.hooks : null
-
-  if (hooks) {
-    const beforeWildcardHook = hooks.before ? sanitizeHooks(hooks.before['*'], action.service) : null
-    const afterWildcardHook = hooks.after ? sanitizeHooks(hooks.after['*'], action.service) : null
-    const errorWildcardHook = hooks.error ? sanitizeHooks(hooks.error['*'], action.service) : null
-    const beforeHook = hooks.before ? sanitizeHooks(hooks.before[name], action.service) : null
-    const afterHook = hooks.after ? sanitizeHooks(hooks.after[name], action.service) : null
-    const errorHook = hooks.error ? sanitizeHooks(hooks.error[name], action.service) : null
-
-    if (beforeWildcardHook || afterWildcardHook || errorWildcardHook || beforeHook || afterHook || errorHook) {
+  const name = action.shortName;
+  const hooks = (action.service && action.service.schema) ? action.service.schema.hooks : null;
+
+  if (hooks || action.hooks) {
+    // Wildcard hooks
+    const beforeWildcardHook = hooks && hooks.before ? sanitizeHooks(hooks.before['*'], action.service) : null;
+    const afterWildcardHook = hooks && hooks.after ? sanitizeHooks(hooks.after['*'], action.service) : null;
+    const errorWildcardHook = hooks && hooks.error ? sanitizeHooks(hooks.error['*'], action.service) : null;
+
+    // Action name-related hooks
+    const beforeHook = hooks && hooks.before ? sanitizeHooks(hooks.before[name], action.service) : null;
+    const afterHook = hooks && hooks.after ? sanitizeHooks(hooks.after[name], action.service) : null;
+    const errorHook = hooks && hooks.error ? sanitizeHooks(hooks.error[name], action.service) : null;
+
+    // Hooks in action definition
+    const actionBeforeHook = action.hooks && action.hooks.before ? sanitizeHooks(action.hooks.before, action.service) : null;
+    const actionAfterHook = action.hooks && action.hooks.after ? sanitizeHooks(action.hooks.after, action.service) : null;
+    const actionErrorHook = action.hooks && action.hooks.error ? sanitizeHooks(action.hooks.error, action.service) : null;
+
+    if (
+      beforeWildcardHook ||
+      afterWildcardHook ||
+      errorWildcardHook ||
+      beforeHook ||
+      afterHook ||
+      errorHook ||
+      actionBeforeHook ||
+      actionAfterHook ||
+      actionErrorHook
+    ) {
       return function actionHookMiddleware (context, serviceInjections) {
-        let promise = Promise.resolve()
+        let promise = Promise.resolve();
 
         // before all hook
         if (beforeWildcardHook) {
-          promise = promise.then(() => callHook(beforeWildcardHook, action.service, context))
+          promise = promise.then(() => callHook(beforeWildcardHook, action.service, context));
         }
 
         // Before hook
         if (beforeHook) {
-          promise = promise.then(() => callHook(beforeHook, action.service, context))
+          promise = promise.then(() => callHook(beforeHook, action.service, context));
+        }
+
+        // Before hook
+        if (actionBeforeHook) {
+          promise = promise.then(() => callHook(actionBeforeHook, action.service, context));
         }
 
         // Call action handler
-        promise = promise.then(() => handler(context, serviceInjections))
+        promise = promise.then(() => handler(context, serviceInjections));
+
+        // After hook in action definition
+        if (actionAfterHook) {
+          promise = promise.then(result => callHook(actionAfterHook, action.service, context, result));
+        }
 
         // After hook
         if (afterHook) {
-          promise = promise.then(result => callHook(afterHook, action.service, context, result))
+          promise = promise.then(result => callHook(afterHook, action.service, context, result));
         }
 
         // After wildcard hook
         if (afterWildcardHook) {
-          promise = promise.then(result => callHook(afterWildcardHook, action.service, context, result))
+          promise = promise.then(result => callHook(afterWildcardHook, action.service, context, result));
+        }
+
+        // Error hooks
+        // Error hook in action definition
+        if (actionErrorHook) {
+          promise = promise.catch(error => callErrorHook(actionErrorHook, action.service, context, error));
         }
 
         // Error hook
         if (errorHook) {
-          promise = promise.catch(error => callHook(errorHook, action.service, context, error))
+          promise = promise.catch(error => callErrorHook(errorHook, action.service, context, error));
         }
+
         // Error wildcard hook
         if (errorWildcardHook) {
-          promise = promise.catch(error => callHook(errorWildcardHook, action.service, context, error))
+          promise = promise.catch(error => callErrorHook(errorWildcardHook, action.service, context, error));
         }
 
-        return promise
-      }
+        return promise;
+      };
     }
   }
-  return handler
-}
+  return handler;
+};
 
 module.exports = () => {
   return {
     localAction: makeActionHookMiddleware
-  }
-}
+  };
+};