Merge pull request #43 from ThaUnknown/esm

BREAKING CHANGE: ESM only

feat: esm

README.md

@@ -24,7 +24,7 @@ npm install bittorrent-peerid
 ## usage
 
 ```js
-const peerid = require('bittorrent-peerid')
+import peerid from 'bittorrent-peerid'
 const parsed = peerid('-AZ2200-6wfG2wk6wWLc')
 
 console.log(parsed.client, parsed.version)

index.js

@@ -1,13 +1,13 @@
 /*! bittorrent-peerid. MIT License. WebTorrent LLC <https://webtorrent.io/opensource> */
-const utils = require('./lib/utils')
+import { decodeBitCometClient, decodeBitSpiritClient, getAzStyleVersionNumber, identifyAwkwardClient, isAzStyle, isMainlineStyle, isPossibleSpoofClient, isShadowStyle } from './lib/utils.js'
 
 /**
  * Parses and returns the client type and version of a bittorrent peer id.
  * Throws an exception if the peer id is invalid.
  *
  * @param {Buffer|string} peerId (as Buffer or hex/utf8 string)
  */
-module.exports = peerId => {
+export default (peerId) => {
   let buffer
 
   if (Buffer.isBuffer(peerId)) {
@@ -32,14 +32,14 @@ module.exports = peerId => {
 
   // If the client reuses parts of the peer ID of other peers, then try to determine this
   // first (before we misidentify the client).
-  if (utils.isPossibleSpoofClient(peerId)) {
-    if ((client = utils.decodeBitSpiritClient(peerId, buffer))) return client
-    if ((client = utils.decodeBitCometClient(peerId, buffer))) return client
+  if (isPossibleSpoofClient(peerId)) {
+    if ((client = decodeBitSpiritClient(peerId, buffer))) return client
+    if ((client = decodeBitCometClient(peerId, buffer))) return client
     return { client: 'BitSpirit?' }
   }
 
   // See if the client uses Az style identification
-  if (utils.isAzStyle(peerId)) {
+  if (isAzStyle(peerId)) {
     if ((client = getAzStyleClientName(peerId))) {
       const version = getAzStyleClientVersion(client, peerId)
 
@@ -76,24 +76,24 @@ module.exports = peerId => {
   }
 
   // See if the client uses Shadow style identification
-  if (utils.isShadowStyle(peerId)) {
+  if (isShadowStyle(peerId)) {
     if ((client = getShadowStyleClientName(peerId))) {
       // TODO: handle shadow style client version numbers
       return { client }
     }
   }
 
   // See if the client uses Mainline style identification
-  if (utils.isMainlineStyle(peerId)) {
+  if (isMainlineStyle(peerId)) {
     if ((client = getMainlineStyleClientName(peerId))) {
       // TODO: handle mainline style client version numbers
       return { client }
     }
   }
 
   // Check for BitSpirit / BitComet disregarding spoof mode
-  if ((client = utils.decodeBitSpiritClient(peerId, buffer))) return client
-  if ((client = utils.decodeBitCometClient(peerId, buffer))) return client
+  if ((client = decodeBitSpiritClient(peerId, buffer))) return client
+  if ((client = decodeBitCometClient(peerId, buffer))) return client
 
   // See if the client identifies itself using a particular substring
   const data = getSimpleClient(peerId)
@@ -108,7 +108,7 @@ module.exports = peerId => {
   }
 
   // See if client is known to be awkward / nonstandard
-  if ((client = utils.identifyAwkwardClient(peerId, buffer))) {
+  if ((client = identifyAwkwardClient(peerId, buffer))) {
     return client
   }
 
@@ -242,7 +242,7 @@ function getAzStyleClientVersion (client, peerId) {
   const version = azStyleClientVersions[client]
   if (!version) return null
 
-  return utils.getAzStyleVersionNumber(peerId.substring(3, 7), version)
+  return getAzStyleVersionNumber(peerId.substring(3, 7), version)
 }
 
 (() => {