feat: esm

Author: ThaUnknown

bin/cmd.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const minimist = require('minimist')
-const Server = require('../').Server
+import minimist from 'minimist'
+import { Server } from '../index.js'
 
 const argv = minimist(process.argv.slice(2), {
   alias: {

client.js

@@ -1,14 +1,16 @@
-const debug = require('debug')('bittorrent-tracker:client')
-const EventEmitter = require('events')
-const once = require('once')
-const parallel = require('run-parallel')
-const Peer = require('simple-peer')
-const queueMicrotask = require('queue-microtask')
-
-const common = require('./lib/common')
-const HTTPTracker = require('./lib/client/http-tracker') // empty object in browser
-const UDPTracker = require('./lib/client/udp-tracker') // empty object in browser
-const WebSocketTracker = require('./lib/client/websocket-tracker')
+import Debug from 'debug'
+import EventEmitter from 'events'
+import once from 'once'
+import parallel from 'run-parallel'
+import Peer from 'simple-peer'
+import queueMicrotask from 'queue-microtask'
+
+import common from './lib/common.js'
+import HTTPTracker from './lib/client/http-tracker.js' // empty object in browser
+import UDPTracker from './lib/client/udp-tracker.js' // empty object in browser
+import WebSocketTracker from './lib/client/websocket-tracker.js'
+
+const debug = Debug('bittorrent-tracker:client')
 
 /**
  * BitTorrent tracker client.
@@ -68,7 +70,7 @@ class Client extends EventEmitter {
     // Remove trailing slash from trackers to catch duplicates
     announce = announce.map(announceUrl => {
       announceUrl = announceUrl.toString()
-      if (announceUrl[announceUrl.length - 1] === '/') {
+      if (announceUrl[announceUrl.length - 1] === '/index.js') {
         announceUrl = announceUrl.substring(0, announceUrl.length - 1)
       }
       return announceUrl
@@ -289,4 +291,4 @@ Client.scrape = (opts, cb) => {
   return client
 }
 
-module.exports = Client
+export default Client

examples/express-embed/server.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const Server = require('../..').Server
-const express = require('express')
+import { Server } from '../../index.js'
+import express from 'express'
 const app = express()
 
 // https://wiki.theory.org/BitTorrentSpecification#peer_id

index.js

@@ -1,7 +1,6 @@
 /*! bittorrent-tracker. MIT License. WebTorrent LLC <https://webtorrent.io/opensource> */
-const Client = require('./client')
-const Server = require('./server')
+import Client from './client.js'
+import Server from './server.js'
 
-module.exports = Client
-module.exports.Client = Client
-module.exports.Server = Server
+export default Client
+export { Client, Server }

lib/client/http-tracker.js

@@ -1,14 +1,15 @@
-const arrayRemove = require('unordered-array-remove')
-const bencode = require('bencode')
-const clone = require('clone')
-const compact2string = require('compact2string')
-const debug = require('debug')('bittorrent-tracker:http-tracker')
-const get = require('simple-get')
-const Socks = require('socks')
-
-const common = require('../common')
-const Tracker = require('./tracker')
-
+import arrayRemove from 'unordered-array-remove'
+import bencode from 'bencode'
+import clone from 'clone'
+import Debug from 'debug'
+import get from 'simple-get'
+import Socks from 'socks'
+
+import common from '../common.js'
+import Tracker from './tracker.js'
+import compact2string from 'compact2string'
+
+const debug = Debug('bittorrent-tracker:http-tracker')
 const HTTP_SCRAPE_SUPPORT = /\/(announce)[^/]*$/
 
 /**
@@ -256,4 +257,4 @@ class HTTPTracker extends Tracker {
 
 HTTPTracker.prototype.DEFAULT_ANNOUNCE_INTERVAL = 30 * 60 * 1000 // 30 minutes
 
-module.exports = HTTPTracker
+export default HTTPTracker

lib/client/tracker.js

@@ -1,4 +1,4 @@
-const EventEmitter = require('events')
+import EventEmitter from 'events'
 
 class Tracker extends EventEmitter {
   constructor (client, announceUrl) {
@@ -25,4 +25,4 @@ class Tracker extends EventEmitter {
   }
 }
 
-module.exports = Tracker
+export default Tracker

lib/client/udp-tracker.js

@@ -1,14 +1,16 @@
-const arrayRemove = require('unordered-array-remove')
-const BN = require('bn.js')
-const clone = require('clone')
-const compact2string = require('compact2string')
-const debug = require('debug')('bittorrent-tracker:udp-tracker')
-const dgram = require('dgram')
-const randombytes = require('randombytes')
-const Socks = require('socks')
-
-const common = require('../common')
-const Tracker = require('./tracker')
+import arrayRemove from 'unordered-array-remove'
+import BN from 'bn.js'
+import clone from 'clone'
+import Debug from 'debug'
+import dgram from 'dgram'
+import randombytes from 'randombytes'
+import Socks from 'socks'
+
+import common from '../common.js'
+import Tracker from './tracker.js'
+import compact2string from 'compact2string'
+
+const debug = Debug('bittorrent-tracker:udp-tracker')
 
 /**
  * UDP torrent tracker client (for an individual tracker)
@@ -329,4 +331,4 @@ function toUInt64 (n) {
 
 function noop () {}
 
-module.exports = UDPTracker
+export default UDPTracker

lib/client/websocket-tracker.js

@@ -1,12 +1,14 @@
-const clone = require('clone')
-const debug = require('debug')('bittorrent-tracker:websocket-tracker')
-const Peer = require('simple-peer')
-const randombytes = require('randombytes')
-const Socket = require('simple-websocket')
-const Socks = require('socks')
+import clone from 'clone'
+import Debug from 'debug'
+import Peer from 'simple-peer'
+import randombytes from 'randombytes'
+import Socket from 'simple-websocket'
+import Socks from 'socks'
 
-const common = require('../common')
-const Tracker = require('./tracker')
+import common from '../common.js'
+import Tracker from './tracker.js'
+
+const debug = Debug('bittorrent-tracker:websocket-tracker')
 
 // Use a socket pool, so tracker clients share WebSocket objects for the same server.
 // In practice, WebSockets are pretty slow to establish, so this gives a nice performance
@@ -439,4 +441,4 @@ WebSocketTracker._socketPool = socketPool
 
 function noop () {}
 
-module.exports = WebSocketTracker
+export default WebSocketTracker

lib/common-node.js

@@ -3,23 +3,23 @@
  * These are separate from common.js so they can be skipped when bundling for the browser.
  */
 
-const querystring = require('querystring')
+import querystring from 'querystring'
 
-exports.IPV4_RE = /^[\d.]+$/
-exports.IPV6_RE = /^[\da-fA-F:]+$/
-exports.REMOVE_IPV4_MAPPED_IPV6_RE = /^::ffff:/
+export const IPV4_RE = /^[\d.]+$/
+export const IPV6_RE = /^[\da-fA-F:]+$/
+export const REMOVE_IPV4_MAPPED_IPV6_RE = /^::ffff:/
 
-exports.CONNECTION_ID = Buffer.concat([toUInt32(0x417), toUInt32(0x27101980)])
-exports.ACTIONS = { CONNECT: 0, ANNOUNCE: 1, SCRAPE: 2, ERROR: 3 }
-exports.EVENTS = { update: 0, completed: 1, started: 2, stopped: 3, paused: 4 }
-exports.EVENT_IDS = {
+export const CONNECTION_ID = Buffer.concat([toUInt32(0x417), toUInt32(0x27101980)])
+export const ACTIONS = { CONNECT: 0, ANNOUNCE: 1, SCRAPE: 2, ERROR: 3 }
+export const EVENTS = { update: 0, completed: 1, started: 2, stopped: 3, paused: 4 }
+export const EVENT_IDS = {
   0: 'update',
   1: 'completed',
   2: 'started',
   3: 'stopped',
   4: 'paused'
 }
-exports.EVENT_NAMES = {
+export const EVENT_NAMES = {
   update: 'update',
   completed: 'complete',
   started: 'start',
@@ -31,36 +31,35 @@ exports.EVENT_NAMES = {
  * Client request timeout. How long to wait before considering a request to a
  * tracker server to have timed out.
  */
-exports.REQUEST_TIMEOUT = 15000
+export const REQUEST_TIMEOUT = 15000
 
 /**
  * Client destroy timeout. How long to wait before forcibly cleaning up all
  * pending requests, open sockets, etc.
  */
-exports.DESTROY_TIMEOUT = 1000
+export const DESTROY_TIMEOUT = 1000
 
-function toUInt32 (n) {
+export function toUInt32 (n) {
   const buf = Buffer.allocUnsafe(4)
   buf.writeUInt32BE(n, 0)
   return buf
 }
-exports.toUInt32 = toUInt32
 
 /**
  * `querystring.parse` using `unescape` instead of decodeURIComponent, since bittorrent
  * clients send non-UTF8 querystrings
  * @param  {string} q
  * @return {Object}
  */
-exports.querystringParse = q => querystring.parse(q, null, null, { decodeURIComponent: unescape })
+export const querystringParse = q => querystring.parse(q, null, null, { decodeURIComponent: unescape })
 
 /**
  * `querystring.stringify` using `escape` instead of encodeURIComponent, since bittorrent
  * clients send non-UTF8 querystrings
  * @param  {Object} obj
  * @return {string}
  */
-exports.querystringStringify = obj => {
+export const querystringStringify = obj => {
   let ret = querystring.stringify(obj, null, null, { encodeURIComponent: escape })
   ret = ret.replace(/[@*/+]/g, char => // `escape` doesn't encode the characters @*/+ so we do it manually
   `%${char.charCodeAt(0).toString(16).toUpperCase()}`)

lib/common.js

@@ -1,18 +1,19 @@
 /**
  * Functions/constants needed by both the client and server.
  */
+import * as common from './common-node.js'
 
-exports.DEFAULT_ANNOUNCE_PEERS = 50
-exports.MAX_ANNOUNCE_PEERS = 82
+export const DEFAULT_ANNOUNCE_PEERS = 50
+export const MAX_ANNOUNCE_PEERS = 82
 
-exports.binaryToHex = str => {
+export const binaryToHex = str => {
   if (typeof str !== 'string') {
     str = String(str)
   }
   return Buffer.from(str, 'binary').toString('hex')
 }
 
-exports.hexToBinary = str => {
+export const hexToBinary = str => {
   if (typeof str !== 'string') {
     str = String(str)
   }
@@ -31,7 +32,7 @@ exports.hexToBinary = str => {
 // Bug reports:
 // - Chrome: https://bugs.chromium.org/p/chromium/issues/detail?id=734880
 // - Firefox: https://bugzilla.mozilla.org/show_bug.cgi?id=1374505
-exports.parseUrl = str => {
+export const parseUrl = str => {
   const url = new URL(str.replace(/^udp:/, 'http:'))
 
   if (str.match(/^udp:/)) {
@@ -45,5 +46,11 @@ exports.parseUrl = str => {
   return url
 }
 
-const config = require('./common-node')
-Object.assign(exports, config)
+export default {
+  DEFAULT_ANNOUNCE_PEERS,
+  MAX_ANNOUNCE_PEERS,
+  binaryToHex,
+  hexToBinary,
+  parseUrl,
+  ...common
+}