uniswap-v2-loader 5.0.19 → 5.0.21

package/.github/workflows/test.yml

@@ -32,7 +32,6 @@ jobs:
       run: npm install -g npm@latest
 
     - name: Global install package CLI version
-
       run: npm i -g .
 
     - name: Test CLI load first 4 pairs from Uniswap V2 using 2 workers

package/README.md

@@ -13,7 +13,7 @@
 | **ShibaSwap** | `0x115934131916c8b277dd010ee02de363c09d037c` |
 | **DefiSwap** | `0x9deb29c9a4c7a88a3c0257393b7f3335338d9a9d` |
 | **EtherVista** | `0x9a27cb5ae0b2cee0bb71f9a85c0d60f3920757b4` |
-| **Balancer V2** | `0xba12222222228d8ba445958a75a0704d566bf2c8` |
+| **RadioShack** | `0x91fae1bc94a9793708fbc66adcb59087c46dee10` |
 
 
 ## CLI

package/index.js

@@ -99,14 +99,10 @@ const load = (params = {}) => {
             .then(() => pairs)
         }
 
-        const missed = []
-        for (var i = start_loading_from, ids; i < all_pairs_length; i++) {
-            if (!ids || ids.length % multicall_size == 0) {
-                ids = []
-                missed.push(ids)
-            }
-            ids.push(i)
-        }
+        const missed = Array(workers).fill(null).map(() => [])
+
+        for (var i = start_loading_from, iw = 0; i < all_pairs_length; i++)
+            missed[iw++ % workers].push(i)
         
         cluster.setupPrimary({ exec: path.join(__dirname, 'loader.js') })
         
@@ -114,11 +110,16 @@ const load = (params = {}) => {
             missed
             .filter(_ => _.length)
             .map((ids, i) => new Promise(y => {
+                if (abort_signal?.aborted) return y()
                 const w = cluster.fork()
-                abort_signal?.addEventListener('abort', () => w.send('abort'))
+                const onabort = () => w.send('abort')
+                abort_signal?.addEventListener('abort', onabort, { once: true })
                 w.send({ ids, factory, key, multicall_size })
                 w.on('message', onpair)
-                w.on('exit', y)
+                w.on('exit', () => {
+                    abort_signal?.removeEventListener('abort', onabort)
+                    y()
+                })
             }))
         ).then(() => pairs)
     })

package/package.json

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

package/test-esm.mjs

@@ -1,18 +0,0 @@
-import { load, subscribe } from './index.mjs'
-import assert from 'node:assert/strict'
-import { describe, it } from 'node:test'
-
-describe('ESM Support', () => {
-    it('should import load and subscribe', () => {
-        assert.equal(typeof load, 'function')
-        assert.equal(typeof subscribe, 'function')
-    })
-
-    it('should load first pair', () => 
-        load({ to: 1 })
-        .then(pairs => {
-            assert.equal(pairs.length, 1)
-            assert.equal(pairs[0].id, 0)
-        })
-    )
-})