uniswap-v2-loader 5.0.8 → 5.0.10

package/README.md

@@ -18,16 +18,11 @@
 
 ## CLI
 ```bash
-npm i -g uniswap-v2-loader
-uniswap-v2-loader --help
-Options:
- 	--key
-	--factory
-	--filename
-	--multicall_size
-	--from
-	--to
-	--workers
+> npm i -g uniswap-v2-loader
+> uniswap-v2-loader --from=1 --to=3
+
+2,0x12ede161c702d1494612d19f05992f43aa6a26fb,0x06af07097c9eeb7fd685c692751d5c66db49c215,0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
+3,0xa478c2975ab1ea89e8196811f51a7b7ade33eb11,0x6b175474e89094c44da98b954eedeac495271d0f,0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
 ```
 
 ## API Reference

package/bin/uniswap-v2-loader

@@ -2,15 +2,6 @@
 const { load } = require('../index')
 const rl = require('readline')
 
-const progress = (c, t) => {
-	const total_len = t.toString().length
-	const cur = c.toString().padStart(total_len)
-	const pct = (c / t * 100 | 0).toString().padStart(3)
-	rl.cursorTo(process.stdout, 0)
-	rl.clearLine(process.stdout, 0)
-	process.stdout.write(`Loaded: ${cur} / ${t} (${pct}%)`)
-}
-
 const options = [
     'key',
     'factory',
@@ -21,7 +12,7 @@ const options = [
     'workers',
 ]
 
-const params = { progress }
+const params = {}
 var i = 2
 while (arg = process.argv[i]) {
     if (arg == '-h' || arg == '--help') {
@@ -45,8 +36,40 @@ while (arg = process.argv[i]) {
             process.exit(22)
         }
     }
+	if (option == 'from' || option == 'to') {
+		value = Number(value)
+		if (isNaN(value) || value < 0 || !Number.isInteger(value)) {
+			console.log(`"${option}" should be a numeric index of pair at factory.`)
+			process.exit(22)
+		}
+	}
+	if (option == 'workers') {
+		value = Number(value)
+		if (isNaN(value) || value < 0 || !Number.isInteger(value)) {
+			console.log(`"workers" should be a numeric and positive integer.`)
+			process.exit(22)
+		}
+	}
+	if (option == 'multicall_size') {
+		value = Number(value)
+		if (isNaN(value) || value < 1 || !Number.isInteger(value)) {
+			console.log(`"multicall_size" should be a numeric. Not less then 1 request.`)
+			process.exit(22)
+		}
+	}
     params[option] = value
     i++
 }
 
+params.progress = params.filename
+	? (c, t, pair) => {
+		const total_left = t.toString().length
+		const cur = c.toString().padStart(total_left)
+		const pct = String(Math.round(100 * c / t)).padStart(3)
+		rl.cursorTo(process.stdout, 0)
+		rl.clearLine(process.stdout, 0)
+		process.stdout.write(`Loaded: ${cur} / ${t} (${pct}%)`)
+	}
+	: (c, t, _) => console.log(`${_.id},${_.pair},${_.token0},${_.token1}`)
+
 load(params)

package/index.js

@@ -20,6 +20,7 @@ const load = (params = {}) => {
         pairs,
     } = params
     filename ??= default_cache_filename(factory)
+    workers = Math.min(workers, max_workers)
 
     pairs ??= fs.existsSync(filename)
         ? fs.readFileSync(filename).toString().trim().split('\n')
@@ -37,8 +38,14 @@ const load = (params = {}) => {
             }, [])
         : []
 
-    if (to && pairs.length > to) return Promise.resolve(pairs.slice(0, to))
+    if (to >= 0 && pairs.length >= to) {
+        if (progress)
+            for (var i = from; i < to; i++)
+                progress(pairs[i].id, to, pairs[i])
 
+        return Promise.resolve(pairs.slice(0, to))
+    }
+    
     return (to
         ? Promise.resolve(to)
         : fetch('https://eth-mainnet.g.alchemy.com/v2/' + key, {
@@ -53,24 +60,24 @@ const load = (params = {}) => {
         }).then(_ => _.json()).then(_ => Number(_.result))
     ).then(all_pairs_length => {
         const start_loading_from = pairs.length
-            ? Math.max(from || 0, pairs[pairs.length - 1].id + 1)
+            ? Math.max(from, pairs[pairs.length - 1].id + 1)
             : 0
 
         var next_pair_order = pairs.length
             ? pairs[pairs.length - 1].id + 1
             : 0
-        var progress_i = 0
-        const progress_end = all_pairs_length - start_loading_from
+
+        if (progress)
+            for (var i = from; i < start_loading_from; i++)
+                progress(pairs[i].id, all_pairs_length, pairs[i])
         
         const onpair = pair => {
             pairs[pair.id] = pair
-            if (progress) progress(++progress_i, progress_end)
-            if (filename) {
-                var _
-                while (_ = pairs[next_pair_order]) {
-                    fs.appendFileSync(filename, `${_.id},${_.pair},${_.token0},${_.token1}\n`)
-                    next_pair_order++
-                }
+            if (progress) progress(pair.id, all_pairs_length, pair)
+            var _
+            while (_ = pairs[next_pair_order]) {
+                fs.appendFileSync(filename, `${_.id},${_.pair},${_.token0},${_.token1}\n`)
+                next_pair_order++
             }
         }
 
@@ -79,7 +86,7 @@ const load = (params = {}) => {
             for (var i = start_loading_from; i < all_pairs_length; i++)
                 ids.push(i)
             return require('./loader')({ ids, factory, key, multicall_size }, onpair)
-        
+            .then(() => pairs)
         }
 
         const missed = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uniswap-v2-loader",
-  "version": "5.0.8",
+  "version": "5.0.10",
   "description": "Uniswap v2 protocol loader",
   "keywords": [
     "uniswap-v2",