@evanp/activitypub-bot 0.41.1 → 0.41.3

package/lib/distributionworker.js

@@ -19,62 +19,62 @@ export class DistributionWorker extends Worker {
     try {
       await this.#client.post(inbox, activityObj, username)
       this._logger.info({ activity: activity.id, inbox }, 'Delivered activity')
-    } catch (error) {
-      if (!error.status) {
+    } catch (err) {
+      if (!err.status) {
         this._logger.warn(
-          { error, activity: activity.id, inbox },
+          { err, activity: activity.id, inbox },
           'Could not deliver activity and no HTTP status available')
-        throw error
-      } else if (error.status >= 300 && error.status < 400) {
+        throw err
+      } else if (err.status >= 300 && err.status < 400) {
         this._logger.warn(
-          { error, activity: activity.id, inbox },
+          { err, activity: activity.id, inbox },
           'Could not deliver activity and unexpected redirect code'
         )
-        throw error
-      } else if (error.status >= 400 && error.status < 500) {
+        throw err
+      } else if (err.status >= 400 && err.status < 500) {
         this._logger.warn(
-          { error, activity: activity.id, inbox },
+          { err, activity: activity.id, inbox },
           'Could not deliver activity due to client error'
         )
-        if ([408, 425, 429].includes(error.status)) {
+        if ([408, 425, 429].includes(err.status)) {
           this._logger.debug(
-            { error, activity: activity.id, inbox },
+            { err, activity: activity.id, inbox },
             'Retrying on recoverable status'
           )
-          const recoverable = new RecoverableError(error.message)
-          recoverable.delay = this.#retryDelay(error.headers, attempts)
+          const recoverable = new RecoverableError(err.message)
+          recoverable.delay = this.#retryDelay(err.headers, attempts)
           throw recoverable
         } else {
-          throw error
+          throw err
         }
-      } else if (error.status >= 500 && error.status < 600) {
-        if ([501, 505, 508, 510].includes(error.status)) {
+      } else if (err.status >= 500 && err.status < 600) {
+        if ([501, 505, 508, 510].includes(err.status)) {
           this._logger.warn(
-            { error, activity: activity.id, inbox, attempts },
+            { err, activity: activity.id, inbox, attempts },
             'Could not deliver activity due to unrecoverable server error'
           )
-          throw error
+          throw err
         } else if (attempts >= DistributionWorker.#MAX_ATTEMPTS) {
           this._logger.warn(
-            { error, activity: activity.id, inbox, attempts },
+            { err, activity: activity.id, inbox, attempts },
             'Could not deliver activity due to server error; no more attempts'
           )
-          throw error
+          throw err
         } else {
-          const recoverable = new RecoverableError(error.message)
-          recoverable.delay = this.#retryDelay(error.headers, attempts)
+          const recoverable = new RecoverableError(err.message)
+          recoverable.delay = this.#retryDelay(err.headers, attempts)
           this._logger.warn(
-            { error, activity: activity.id, inbox, attempts, delay: recoverable.delay },
+            { err, activity: activity.id, inbox, attempts, delay: recoverable.delay },
             'Could not deliver activity due to server error; will retry'
           )
           throw recoverable
         }
       } else {
         this._logger.warn(
-          { error, activity: activity.id, inbox },
+          { err, activity: activity.id, inbox },
           'Could not deliver activity due to unexpected status range'
         )
-        throw error
+        throw err
       }
     }
   }

package/lib/safeagent.js

@@ -27,7 +27,16 @@ export class SafeAgent extends https.Agent {
       if (isPrivateIP(address)) {
         return callback(new PrivateNetworkError(address))
       }
-      super.createConnection({ ...options, hostname: address }, callback)
+      try {
+        const socket = super.createConnection({
+          ...options,
+          host: address,
+          servername: options.servername || options.hostname
+        })
+        callback(null, socket)
+      } catch (e) {
+        callback(e)
+      }
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.41.1",
+  "version": "0.41.3",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",