u-wave-announce 0.5.2 → 0.5.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "u-wave-announce",
   "description": "Announce your üWave server's existence to the world.",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "author": "Renée Kooi <renee@kooi.me>",
   "dependencies": {
     "debug": "^4.3.2",

package/src/plugin.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const { promisify } = require('util');
 const randomBytes = promisify(require('crypto').randomBytes);
 const fetch = require('node-fetch');
@@ -6,6 +8,16 @@ const debug = require('debug')('uwave:announce');
 const sodium = require('./signatures');
 const pkg = require('../package.json');
 
+/**
+ * Fallback logger implementation for üWave Core versions that do
+ * not come with a logger yet.
+ */
+const debugLogger = {
+  debug,
+  info: debug,
+  error: debug,
+};
+
 const optionsSchema = {
   type: 'object',
   title: 'Announce',
@@ -151,6 +163,11 @@ async function getOrGenerateSeed(uw) {
 async function announcePlugin(uw, staticOptions) {
   uw.config.register(optionsSchema['uw:key'], optionsSchema);
 
+  // üWave Core 0.5.0 and up have a `pino` logger
+  const logger = uw.logger
+    ? uw.logger.child({ ns: 'uwave:announce' })
+    : debugLogger;
+
   const seed = staticOptions.seed || await getOrGenerateSeed(uw);
   // This takes up to a few 100 ms but it is a one-time startup cost…
   // Maybe it makes sense to cache this, or to not block the rest of
@@ -160,17 +177,17 @@ async function announcePlugin(uw, staticOptions) {
   async function announce() {
     const options = await uw.config.get(optionsSchema['uw:key']);
     if (typeof options !== 'object') {
-      debug('announcing not configured, skipping');
+      logger.debug('announcing not configured, skipping');
       return;
     }
     if (!options.enabled) {
-      debug('announcing disabled, skipping');
+      logger.debug('announcing disabled, skipping');
       return;
     }
 
     const hubHost = options.hub || 'https://announce.u-wave.net';
     const announceUrl = `${stripSlashes(hubHost)}/announce/${Buffer.from(publicKey).toString('hex')}`;
-    debug('announcing to', announceUrl);
+    logger.info('announcing to', announceUrl);
 
     const announcement = await getAnnounceData(uw, options);
     const data = JSON.stringify(announcement);
@@ -189,8 +206,8 @@ async function announcePlugin(uw, staticOptions) {
     });
   }
 
-  function onError(err) {
-    debug(err);
+  function onError(error) {
+    logger.error({ err: error });
   }
 
   let interval;

package/src/signatures.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Based on https://github.com/mafintosh/sodium-signatures/blob/master/index.js
 const sodium = require('libsodium-wrappers');
 

package/test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const assert = require('assert');
 
 assert.doesNotThrow(() => {