REFACTOR: modernize module structure

Jon-Biz · Jon-Biz · commit 7702142e3960 · 2020-09-28T15:05:57.000-07:00
diff --git a/client/http-tracker.js b/client/http-tracker.js
@@ -4,7 +4,7 @@ const compact2string = require('compact2string')
 const debug = require('debug')('bittorrent-tracker:http-tracker')
 const get = require('simple-get')
 
-const common = require('../common')
+const common = require('../lib/common')
 const Tracker = require('./tracker')
 
 const HTTP_SCRAPE_SUPPORT = /\/(announce)[^/]*$/
diff --git a/client/index.js b/client/index.js
@@ -4,10 +4,10 @@ const once = require('once')
 const parallel = require('run-parallel')
 const Peer = require('simple-peer')
 
-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')
+const common = require('../lib/common')
+const HTTPTracker = require('./http-tracker') // empty object in browser
+const UDPTracker = require('./udp-tracker') // empty object in browser
+const WebSocketTracker = require('./websocket-tracker')
 
 /**
  * BitTorrent tracker client.
diff --git a/client/tracker.js b/client/tracker.js
diff --git a/client/udp-tracker.js b/client/udp-tracker.js
@@ -5,7 +5,7 @@ const debug = require('debug')('bittorrent-tracker:udp-tracker')
 const dgram = require('dgram')
 const randombytes = require('randombytes')
 
-const common = require('../common')
+const common = require('../lib/common')
 const Tracker = require('./tracker')
 
 /**
diff --git a/client/websocket-tracker.js b/client/websocket-tracker.js
@@ -3,7 +3,7 @@ const Peer = require('simple-peer')
 const randombytes = require('randombytes')
 const Socket = require('simple-websocket')
 
-const common = require('../common')
+const common = require('../lib/common')
 const Tracker = require('./tracker')
 
 // Use a socket pool, so tracker clients share WebSocket objects for the same server.
diff --git a/server/index.js b/server/index.js
@@ -7,7 +7,7 @@ const attachHttpService = require('./services/attachHttp')
 const attachUdpService = require('./services/attachUdp')
 const attachWSService = require('./services/attachWS')
 const setupStatsRoute = require('./services/statsRoute')
-const common = require('./lib/common')
+const common = require('../lib/common')
 const Swarm = require('./swarm')
 
 /**
diff --git a/server/services/attachHttp/index.js b/server/services/attachHttp/index.js
@@ -1,7 +1,7 @@
 const http = require('http')
 const bencode = require('bencode')
 
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 const parseHttpRequest = require('./parseHttpRequest')
 
 function attachHttpServer(server, onListening) {
diff --git a/server/services/attachHttp/parseHttpRequest.js b/server/services/attachHttp/parseHttpRequest.js
@@ -1,6 +1,6 @@
 module.exports = parseHttpRequest
 
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 function parseHttpRequest (req, opts) {
   if (!opts) opts = {}
diff --git a/server/services/attachUdp/index.js b/server/services/attachUdp/index.js
@@ -1,6 +1,6 @@
 const dgram = require('dgram')
 
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 const makeUdpPacket = require('./makeUdpPacket')
 const parseUdpRequest = require('./parseUdpRequest')
diff --git a/server/services/attachUdp/makeUdpPacket.js b/server/services/attachUdp/makeUdpPacket.js
@@ -1,4 +1,4 @@
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 function makeUdpPacket (params) {
   let packet
diff --git a/server/services/attachUdp/parseUdpRequest.js b/server/services/attachUdp/parseUdpRequest.js
@@ -1,7 +1,7 @@
 module.exports = parseUdpRequest
 
 const ipLib = require('ip')
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 function parseUdpRequest (msg, rinfo) {
   if (msg.length < 16) throw new Error('received packet is too short')
diff --git a/server/services/attachWS/index.js b/server/services/attachWS/index.js
@@ -1,7 +1,7 @@
 const WebSocketServer = require("ws").Server
 const debug = require('debug')('bittorrent-tracker:server')
 
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 const parseWebSocketRequest = require("./parseWebsocketRequest")
 const attachHttpServer = require("../attachHttp")
diff --git a/server/services/attachWS/parseWebsocketRequest.js b/server/services/attachWS/parseWebsocketRequest.js
@@ -1,6 +1,6 @@
 module.exports = parseWebSocketRequest
 
-const common = require('../../lib/common')
+const common = require('../../../lib/common')
 
 function parseWebSocketRequest (socket, opts, params) {
   if (!opts) opts = {}
diff --git a/server/services/statsRoute/getStats.js b/server/services/statsRoute/getStats.js
diff --git a/server/services/statsRoute/index.js b/server/services/statsRoute/index.js
diff --git a/server/services/statsRoute/printClients.js b/server/services/statsRoute/printClients.js
diff --git a/server/swarm/index.js b/server/swarm/index.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const common = require('../../lib/common')`
	`1`	`+const common = require('../../../lib/common')`
`2`	`2`
`3`	`3`	`function makeUdpPacket (params) {`
`4`	`4`	`let packet`