proxy-rotator-js 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proxy-rotator-js",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "description": "Proxy Rotator",
   "main": "index.js",

package/src/Proxy.js

@@ -1,5 +1,5 @@
 class Proxy {
-    constructor(proxy, protocol = null) {
+    constructor(proxy, protocol = null, assumeAlive = false) {
         // if proxy string starts with protocol
         if( proxy.includes('://') ){
             this.protocol = proxy.split('://')[0];
@@ -13,7 +13,7 @@ class Proxy {
         // the proxy 
         this.proxy = `${(this.protocol)? this.protocol+'://' : ''}${this.ip}:${this.port}`;
         // status can be 'new', 'alive', 'dead'
-        this.status = 'new';
+        this.status = (assumeAlive)? 'alive' : 'new';
         this.changeTimeStamp = Date.now();
     }
     // method to return as string

package/src/ProxyRotator.js

@@ -6,24 +6,13 @@ class ProxyRotator {
     constructor(proxies, options={} ){
         this.pool = new Queue();
         this.graveyard = [];
-        // examine proxies passed
-        // check if it is a file path
-        if( typeof proxies === 'string' ){
-            // parse file
-            proxies = this._parseFile(proxies);
-            // add proxies to queue
-            proxies.forEach( p => this._add(p) );
-        }else if( this._isArray(proxies) ){
-            // add proxies to queue
-            proxies.forEach( p => this._add(p) );
-        }
         // handle options
-        let { returnType, revive_timer, shuffle, protocol, assume_aliveness, check_on_next } = options;
+        let { proxyType, revive_timer, shuffle, protocol, assume_aliveness, check_on_next } = options;
         // how long to wait before reviving a dead proxy
         // default: 30 minutes
         this.revive_timer = revive_timer ?? 1000 * 60 * 30;
-        // return type of proxy
-        this.returnType = returnType ?? 'string'; // or 'object'
+        // return type of proxy, either 'string' or 'object'
+        this.proxyType = proxyType? this._handleProxyTypeInput(proxyType) : 'string';
         // assume a a protocol for all proxies
         this.protocol = protocol ?? null;
         // shuffle the proxies before adding them to the queue
@@ -32,6 +21,17 @@ class ProxyRotator {
         this.assume_aliveness = assume_aliveness ?? false;
         // check if proxies are alive when they are added to the queue
         this.check_on_next = check_on_next ?? false;
+        // examine proxies passed
+        // check if it is a file path
+        if( typeof proxies === 'string' ){
+            // parse file
+            proxies = this._parseFile(proxies);
+            // add proxies to queue
+            proxies.forEach( p => this._add(p) );
+        }else if( this._isArray(proxies) ){
+            // add proxies to queue
+            proxies.forEach( p => this._add(p) );
+        }
     }
 
     getGraveyard(){ return this.graveyard.map(p => p.proxy) }
@@ -50,7 +50,7 @@ class ProxyRotator {
     }
 
     _add(proxy){ // add proxy to queue
-        let p = new Proxy(proxy);
+        let p = new Proxy(proxy, this.protocol, this.assume_aliveness);
         this.pool.enqueue(p);
     }
 
@@ -113,7 +113,7 @@ class ProxyRotator {
         return this.setDead(proxy);
     }
 
-    next(returnType='string'){
+    next(proxyType=null){
         // resurect a proxy from the graveyard
         if(this.check_on_next) _resurection();
         // if there are no proxies in the pool
@@ -123,11 +123,11 @@ class ProxyRotator {
         // add to back
         this.pool.enqueue(proxy);
         // if returnType is 'string'
-        if(this.returnType === 'string')
-            // return proxy as string
-            return proxy.proxy;
-        else if(this.returnType === 'object')
-            return proxy.toObject();
+        if(proxyType === null) proxyType = this.proxyType;
+        else proxyType = this._handleProxyTypeInput(proxyType);
+        // return proxy
+        if(proxyType === 'string') return proxy.proxy;
+        else if(this.returnType === 'object') return proxy.toObject();
     }
 
     /* Randomize array in-place using Durstenfeld shuffle algorithm */
@@ -141,6 +141,18 @@ class ProxyRotator {
         return array;
     }
 
+    _handleProxyTypeInput(proxyType=null){
+        if(proxyType === null) return null;
+        proxyType = proxyType.toLowerCase();
+        if(proxyType === 'str') proxyType = 'string';
+        if(proxyType === 'obj') proxyType = 'object';
+        if(proxyType !== 'string' && proxyType !== 'object'){
+            console.error('proxyType must be either "string" or "object"');
+            proxyType = 'string';
+        }
+        return proxyType;
+    }
+    
     _parseFile(filename) {
         // read file
         let str = fs.readFileSync(filename, 'utf8');