feat: ✨push stash

Author: Banou26

client.js

@@ -7,8 +7,8 @@ import queueMicrotask from 'queue-microtask'
 import { hex2arr, hex2bin, text2arr, arr2hex, arr2text } from 'uint8-util'
 
 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 HTTPTracker from './lib/client/http-tracker.js'
+import UDPTracker from './lib/client/udp-tracker.js'
 import WebSocketTracker from './lib/client/websocket-tracker.js'
 
 const debug = Debug('bittorrent-tracker:client')
@@ -32,7 +32,7 @@ const debug = Debug('bittorrent-tracker:client')
 class Client extends EventEmitter {
   constructor (opts = {}) {
     super()
-
+    console.log('CLIENT TRACKER CREATED', opts)
     if (!opts.peerId) throw new Error('Option `peerId` is required')
     if (!opts.infoHash) throw new Error('Option `infoHash` is required')
     if (!opts.announce) throw new Error('Option `announce` is required')

lib/client/http-tracker.js

@@ -1,7 +1,8 @@
 import arrayRemove from 'unordered-array-remove'
 import bencode from 'bencode'
 import Debug from 'debug'
-import fetch from 'cross-fetch-ponyfill'
+import { serverProxyFetch as fetch } from '@fkn/lib'
+// import fetch from 'cross-fetch-ponyfill'
 import { bin2hex, hex2bin, arr2text, text2arr, arr2hex } from 'uint8-util'
 
 import common from '../common.js'
@@ -28,6 +29,7 @@ function abortTimeout (ms) {
  */
 class HTTPTracker extends Tracker {
   constructor (client, announceUrl) {
+    console.log('HTTP TRACKER CREATED', client, announceUrl)
     super(client, announceUrl)
 
     debug('new http tracker %s', announceUrl)
@@ -119,7 +121,15 @@ class HTTPTracker extends Tracker {
   }
 
   async _request (requestUrl, params, cb) {
-    const parsedUrl = new URL(requestUrl + (requestUrl.indexOf('?') === -1 ? '?' : '&') + common.querystringStringify(params))
+    const _parsedUrl = new URL(requestUrl + (requestUrl.indexOf('?') === -1 ? '?' : '&') + common.querystringStringify(params))
+    const parsedUrl = new URL(_parsedUrl.toString())
+    parsedUrl.searchParams.set(
+      'info_hash',
+      new URLSearchParams({ info_hash: escape(params.info_hash) })
+        .toString()
+        .replaceAll('%25', '%')
+        .replace('info_hash=', '')
+    )
     let agent
     if (this.client._proxyOpts) {
       agent = parsedUrl.protocol === 'https:' ? this.client._proxyOpts.httpsAgent : this.client._proxyOpts.httpAgent
@@ -142,7 +152,7 @@ class HTTPTracker extends Tracker {
     let res
     let controller = abortTimeout(common.REQUEST_TIMEOUT)
     try {
-      res = await fetch(parsedUrl.toString(), {
+      res = await fetch(parsedUrl.toString().replaceAll('%25', '%'), {
         agent,
         signal: controller.signal,
         dispatcher: agent,

package.json

@@ -11,9 +11,6 @@
     "bittorrent-tracker": "./bin/cmd.js"
   },
   "browser": {
-    "./lib/common-node.js": false,
-    "./lib/client/http-tracker.js": false,
-    "./lib/client/udp-tracker.js": false,
     "./server.js": false,
     "socks": false
   },
@@ -27,6 +24,7 @@
   },
   "type": "module",
   "dependencies": {
+    "@fkn/lib": "file:../../fkn/lib",
     "@thaunknown/simple-peer": "^10.0.6",
     "@thaunknown/simple-websocket": "^9.1.1",
     "bencode": "^4.0.0",