ntr/crates
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: ntr/crates:notify
ntr/crates:bundle-offers ntr/crates:deno ntr/crates:main ntr/crates:master ntr/crates:navbar ntr/crates:notify ntr/crates:toasts ntr/crates:sample-offers ntr/crates:redux ntr/crates:ws ntr/crates:client ntr/crates:prisma
..
pull from: ntr/crates:sample-offers
ntr/crates:deno ntr/crates:main ntr/crates:master ntr/crates:navbar ntr/crates:notify ntr/crates:toasts ntr/crates:sample-offers ntr/crates:bundle-offers ntr/crates:redux ntr/crates:ws ntr/crates:client ntr/crates:prisma
2 Commits
notify .. sample-offers
Author SHA1 Message Date
ntr c99b148e15 sample wip 2022-11-26 18:22:13 +11:00
ntr ffc023f419 Merge branch 'master' into sample-offers 2022-11-26 17:31:14 +11:00
33 changed files with 164 additions and 861 deletions
Expand all files Collapse all files

No files matched your search

TODO.md
+9 -9
View File
@@ -1,14 +1,6 @@
# TODO # TODO
push offers
listen / notify listing ids overflowing
on offers
notify admins
contact options on landing page
move want add to rpc
skip unofficial release skip unofficial release
@@ -16,3 +8,11 @@ status stepper
queue up wantlist adds to gracefully handle rate limiting queue up wantlist adds to gracefully handle rate limiting
push offers
cover off admin routes and commands
listen / notify
on offers
notify admins
api/index.ts
+2 -2
View File
@@ -26,10 +26,10 @@ async function start() {
discogs, discogs,
api, api,
events, events,
notify,
} = createServices(log); } = createServices(log);
await notify.connect(); // events.emit(Events.StartupSync);
// events.emit(Events.ListingsUpdated);
api.listen(); api.listen();
} }
api/package-lock.json
Generated
+4 -336
View File
@@ -23,8 +23,7 @@
"koa-websocket": "^7.0.0", "koa-websocket": "^7.0.0",
"koa-ws": "^1.0.1", "koa-ws": "^1.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"passport-local": "^1.0.0", "passport-local": "^1.0.0"
"pg-listen": "^1.7.0"
}, },
"devDependencies": { "devDependencies": {
"@types/bcrypt": "^5.0.0", "@types/bcrypt": "^5.0.0",
@@ -698,15 +697,6 @@
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
"dev": true "dev": true
}, },
"node_modules/buffer-writer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
"peer": true,
"engines": {
"node": ">=4"
}
},
"node_modules/bufferutil": { "node_modules/bufferutil": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
@@ -2902,12 +2892,6 @@
"url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/packet-reader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
"peer": true
},
"node_modules/parse5": { "node_modules/parse5": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -3007,129 +2991,6 @@
"resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
"integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
}, },
"node_modules/pg": {
"version": "8.8.0",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz",
"integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==",
"peer": true,
"dependencies": {
"buffer-writer": "2.0.0",
"packet-reader": "1.0.0",
"pg-connection-string": "^2.5.0",
"pg-pool": "^3.5.2",
"pg-protocol": "^1.5.0",
"pg-types": "^2.1.0",
"pgpass": "1.x"
},
"engines": {
"node": ">= 8.0.0"
},
"peerDependencies": {
"pg-native": ">=3.0.1"
},
"peerDependenciesMeta": {
"pg-native": {
"optional": true
}
}
},
"node_modules/pg-connection-string": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
"integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==",
"peer": true
},
"node_modules/pg-format": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
"integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw==",
"engines": {
"node": ">=4.0"
}
},
"node_modules/pg-int8": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
"peer": true,
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/pg-listen": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/pg-listen/-/pg-listen-1.7.0.tgz",
"integrity": "sha512-MKDwKLm4ryhy7iq1yw1K1MvUzBdTkaT16HZToddX9QaT8XSdt3Kins5mYH6DLECGFzFWG09VdXvWOIYogjXrsg==",
"dependencies": {
"debug": "^4.1.1",
"pg-format": "^1.0.4",
"typed-emitter": "^0.1.0"
},
"peerDependencies": {
"pg": "7.x || 8.x"
}
},
"node_modules/pg-listen/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"dependencies": {
"ms": "2.1.2"
},
"engines": {
"node": ">=6.0"
},
"peerDependenciesMeta": {
"supports-color": {
"optional": true
}
}
},
"node_modules/pg-listen/node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"node_modules/pg-pool": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
"integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
"peer": true,
"peerDependencies": {
"pg": ">=8.0"
}
},
"node_modules/pg-protocol": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==",
"peer": true
},
"node_modules/pg-types": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
"peer": true,
"dependencies": {
"pg-int8": "1.0.1",
"postgres-array": "~2.0.0",
"postgres-bytea": "~1.0.0",
"postgres-date": "~1.0.4",
"postgres-interval": "^1.1.0"
},
"engines": {
"node": ">=4"
}
},
"node_modules/pgpass": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
"peer": true,
"dependencies": {
"split2": "^4.1.0"
}
},
"node_modules/picomatch": { "node_modules/picomatch": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -3142,45 +3003,6 @@
"url": "https://github.com/sponsors/jonschlinkert" "url": "https://github.com/sponsors/jonschlinkert"
} }
}, },
"node_modules/postgres-array": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
"peer": true,
"engines": {
"node": ">=4"
}
},
"node_modules/postgres-bytea": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/postgres-date": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/postgres-interval": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
"peer": true,
"dependencies": {
"xtend": "^4.0.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/prisma": { "node_modules/prisma": {
"version": "4.5.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz", "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz",
@@ -3412,15 +3234,6 @@
"source-map": "^0.6.0" "source-map": "^0.6.0"
} }
}, },
"node_modules/split2": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
"integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
"peer": true,
"engines": {
"node": ">= 10.x"
}
},
"node_modules/statuses": { "node_modules/statuses": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -3670,11 +3483,6 @@
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/typed-emitter": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-0.1.0.tgz",
"integrity": "sha512-Tfay0l6gJMP5rkil8CzGbLthukn+9BN/VXWcABVFPjOoelJ+koW8BuPZYk+h/L+lEeIp1fSzVRiWRPIjKVjPdg=="
},
"node_modules/typescript": { "node_modules/typescript": {
"version": "4.7.4", "version": "4.7.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
@@ -3828,6 +3636,7 @@
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true,
"engines": { "engines": {
"node": ">=0.4" "node": ">=0.4"
} }
@@ -4467,12 +4276,6 @@
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
"dev": true "dev": true
}, },
"buffer-writer": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz",
"integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==",
"peer": true
},
"bufferutil": { "bufferutil": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-1.1.0.tgz",
@@ -6088,12 +5891,6 @@
"p-limit": "^3.0.2" "p-limit": "^3.0.2"
} }
}, },
"packet-reader": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz",
"integrity": "sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==",
"peer": true
},
"parse5": { "parse5": {
"version": "7.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.0.0.tgz",
@@ -6165,131 +5962,12 @@
"resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
"integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
}, },
"pg": {
"version": "8.8.0",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz",
"integrity": "sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==",
"peer": true,
"requires": {
"buffer-writer": "2.0.0",
"packet-reader": "1.0.0",
"pg-connection-string": "^2.5.0",
"pg-pool": "^3.5.2",
"pg-protocol": "^1.5.0",
"pg-types": "^2.1.0",
"pgpass": "1.x"
}
},
"pg-connection-string": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz",
"integrity": "sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==",
"peer": true
},
"pg-format": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pg-format/-/pg-format-1.0.4.tgz",
"integrity": "sha512-YyKEF78pEA6wwTAqOUaHIN/rWpfzzIuMh9KdAhc3rSLQ/7zkRFcCgYBAEGatDstLyZw4g0s9SNICmaTGnBVeyw=="
},
"pg-int8": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
"integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
"peer": true
},
"pg-listen": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/pg-listen/-/pg-listen-1.7.0.tgz",
"integrity": "sha512-MKDwKLm4ryhy7iq1yw1K1MvUzBdTkaT16HZToddX9QaT8XSdt3Kins5mYH6DLECGFzFWG09VdXvWOIYogjXrsg==",
"requires": {
"debug": "^4.1.1",
"pg-format": "^1.0.4",
"typed-emitter": "^0.1.0"
},
"dependencies": {
"debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"requires": {
"ms": "2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
}
}
},
"pg-pool": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
"integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
"peer": true,
"requires": {}
},
"pg-protocol": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz",
"integrity": "sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==",
"peer": true
},
"pg-types": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
"integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
"peer": true,
"requires": {
"pg-int8": "1.0.1",
"postgres-array": "~2.0.0",
"postgres-bytea": "~1.0.0",
"postgres-date": "~1.0.4",
"postgres-interval": "^1.1.0"
}
},
"pgpass": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
"integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
"peer": true,
"requires": {
"split2": "^4.1.0"
}
},
"picomatch": { "picomatch": {
"version": "2.3.1", "version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true "dev": true
}, },
"postgres-array": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
"integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
"peer": true
},
"postgres-bytea": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
"integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
"peer": true
},
"postgres-date": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
"integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
"peer": true
},
"postgres-interval": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
"integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
"peer": true,
"requires": {
"xtend": "^4.0.0"
}
},
"prisma": { "prisma": {
"version": "4.5.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz", "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.5.0.tgz",
@@ -6460,12 +6138,6 @@
"source-map": "^0.6.0" "source-map": "^0.6.0"
} }
}, },
"split2": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz",
"integrity": "sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==",
"peer": true
},
"statuses": { "statuses": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -6632,11 +6304,6 @@
"mime-types": "~2.1.24" "mime-types": "~2.1.24"
} }
}, },
"typed-emitter": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-0.1.0.tgz",
"integrity": "sha512-Tfay0l6gJMP5rkil8CzGbLthukn+9BN/VXWcABVFPjOoelJ+koW8BuPZYk+h/L+lEeIp1fSzVRiWRPIjKVjPdg=="
},
"typescript": { "typescript": {
"version": "4.7.4", "version": "4.7.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
@@ -6760,7 +6427,8 @@
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true
}, },
"y18n": { "y18n": {
"version": "5.0.8", "version": "5.0.8",
api/package.json
+1 -2
View File
@@ -41,8 +41,7 @@
"koa-websocket": "^7.0.0", "koa-websocket": "^7.0.0",
"koa-ws": "^1.0.1", "koa-ws": "^1.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"passport-local": "^1.0.0", "passport-local": "^1.0.0"
"pg-listen": "^1.7.0"
}, },
"overrides": { "overrides": {
"koa-passport": { "koa-passport": {
api/prisma/migrations/20221226110634_initial_migration/migration.sql
-81
View File
@@ -1,81 +0,0 @@
-- CreateTable
CREATE TABLE "listings" (
"id" BIGINT NOT NULL,
"seller" BIGINT NOT NULL,
"data" JSONB NOT NULL,
"wantId" UUID NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "listings_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "users" (
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
"email" TEXT NOT NULL,
"password" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "users_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "wants" (
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
"release" BIGINT NOT NULL,
"data" JSONB NOT NULL,
"userId" UUID NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL,
CONSTRAINT "wants_pkey" PRIMARY KEY ("id")
);
-- CreateTable
CREATE TABLE "offers" (
"id" UUID NOT NULL DEFAULT gen_random_uuid(),
"status" TEXT NOT NULL,
"condition" TEXT NOT NULL DEFAULT '',
"item" MONEY NOT NULL,
"shipping" MONEY NOT NULL,
"total" MONEY NOT NULL,
"listingId" BIGINT NOT NULL,
"userId" UUID NOT NULL,
"wantId" UUID NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT "offers_pkey" PRIMARY KEY ("id")
);
-- CreateIndex
CREATE INDEX "listings_seller_idx" ON "listings"("seller");
-- CreateIndex
CREATE UNIQUE INDEX "users_email_key" ON "users"("email");
-- CreateIndex
CREATE INDEX "wants_release_idx" ON "wants"("release");
-- CreateIndex
CREATE UNIQUE INDEX "wants_userId_release_key" ON "wants"("userId", "release");
-- CreateIndex
CREATE UNIQUE INDEX "offers_listingId_key" ON "offers"("listingId");
-- AddForeignKey
ALTER TABLE "listings" ADD CONSTRAINT "listings_wantId_fkey" FOREIGN KEY ("wantId") REFERENCES "wants"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "wants" ADD CONSTRAINT "wants_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "offers" ADD CONSTRAINT "offers_listingId_fkey" FOREIGN KEY ("listingId") REFERENCES "listings"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "offers" ADD CONSTRAINT "offers_userId_fkey" FOREIGN KEY ("userId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-- AddForeignKey
ALTER TABLE "offers" ADD CONSTRAINT "offers_wantId_fkey" FOREIGN KEY ("wantId") REFERENCES "wants"("id") ON DELETE CASCADE ON UPDATE CASCADE;
api/prisma/migrations/20221226113955_notify/migration.sql
-111
View File
@@ -1,111 +0,0 @@
CREATE OR REPLACE FUNCTION notify_users() RETURNS TRIGGER AS $$
DECLARE
record RECORD;
id UUID;
payload JSON;
BEGIN
IF (TG_OP = 'DELETE') THEN
id = OLD.id;
ELSE
id = NEW.id;
END IF;
payload = json_build_object(
'table', TG_TABLE_NAME,
'action', TG_OP,
'id', id
);
PERFORM pg_notify('users.events', payload::text);
RETURN NULL;
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION notify_listings() RETURNS TRIGGER AS $$
DECLARE
record RECORD;
id int8;
payload JSON;
BEGIN
IF (TG_OP = 'DELETE') THEN
id = OLD.id;
ELSE
id = NEW.id;
END IF;
payload = json_build_object(
'table', TG_TABLE_NAME,
'action', TG_OP,
'id', id
);
PERFORM pg_notify('listings.events', payload::text);
RETURN NULL;
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION notify_offers() RETURNS TRIGGER AS $$
DECLARE
record RECORD;
id UUID;
payload JSON;
BEGIN
IF (TG_OP = 'DELETE') THEN
id = OLD.id;
ELSE
id = NEW.id;
END IF;
payload = json_build_object(
'table', TG_TABLE_NAME,
'action', TG_OP,
'id', id
);
PERFORM pg_notify('offers.events', payload::text);
RETURN NULL;
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION notify_wants() RETURNS TRIGGER AS $$
DECLARE
record RECORD;
id UUID;
payload JSON;
BEGIN
IF (TG_OP = 'DELETE') THEN
id = OLD.id;
ELSE
id = NEW.id;
END IF;
payload = json_build_object(
'table', TG_TABLE_NAME,
'action', TG_OP,
'id', id
);
PERFORM pg_notify('wants.events', payload::text);
RETURN NULL;
END;
$$ LANGUAGE plpgsql;
CREATE OR REPLACE TRIGGER notify_wants_event
AFTER INSERT OR UPDATE OR DELETE ON wants
FOR EACH ROW EXECUTE PROCEDURE notify_wants();
CREATE OR REPLACE TRIGGER notify_listings_event
AFTER INSERT OR UPDATE OR DELETE ON listings
FOR EACH ROW EXECUTE PROCEDURE notify_listings();
CREATE OR REPLACE TRIGGER notify_offers_event
AFTER INSERT OR UPDATE OR DELETE ON offers
FOR EACH ROW EXECUTE PROCEDURE notify_offers();
CREATE OR REPLACE TRIGGER notify_users_event
AFTER INSERT OR UPDATE OR DELETE ON users
FOR EACH ROW EXECUTE PROCEDURE notify_users();
api/prisma/migrations/migration_lock.toml
-3
View File
@@ -1,3 +0,0 @@
# Please do not edit this file manually
# It should be added in your version-control system (i.e. Git)
provider = "postgresql"
api/prisma/schema.prisma
+4 -7
View File
@@ -11,8 +11,8 @@ datasource db {
} }
model Listing { model Listing {
id BigInt @id id Int @id
seller BigInt seller Int
data Json data Json
wantId String @db.Uuid wantId String @db.Uuid
@@ -43,7 +43,7 @@ model User {
model Want { model Want {
id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
release BigInt release Int
data Json data Json
userId String @db.Uuid userId String @db.Uuid
@@ -71,7 +71,7 @@ model Offer {
shipping Decimal @db.Money shipping Decimal @db.Money
total Decimal @db.Money total Decimal @db.Money
listingId BigInt listingId Int
listing Listing @relation(fields: [listingId], references: [id]) listing Listing @relation(fields: [listingId], references: [id])
userId String @db.Uuid userId String @db.Uuid
@@ -80,9 +80,6 @@ model Offer {
wantId String @db.Uuid wantId String @db.Uuid
want Want @relation(fields: [wantId], references: [id], onDelete: Cascade) want Want @relation(fields: [wantId], references: [id], onDelete: Cascade)
createdAt DateTime @default(now())
updatedAt DateTime @default(now())
// only one offer per want for a user // only one offer per want for a user
// @@unique([userId, wantId]) // @@unique([userId, wantId])
@@unique([listingId]) @@unique([listingId])
api/src/api.ts
+20 -8
View File
@@ -13,11 +13,9 @@ import Bluebird from 'bluebird';
import type Log from 'bunyan'; import type Log from 'bunyan';
import type { Listing, User, Want, Prisma } from '@prisma/client'; import type { Listing, User, Want, Prisma } from '@prisma/client';
import type { Pg } from './pg'; import { Pg } from './pg';
import type { Discogs } from './discogs'; import { Discogs } from './discogs';
import type { Offers } from './offers'; import { Offers } from './offers';
import type { Rpc } from './rpc';
import routerAuth from './routers/router.auth'; import routerAuth from './routers/router.auth';
import { Events } from './events'; import { Events } from './events';
import createRpc, { RpcMessageType } from './rpc'; import createRpc, { RpcMessageType } from './rpc';
@@ -63,6 +61,13 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
ctx.status = 200; ctx.status = 200;
}); });
router.get('/user/offers', async function userOffersGet(ctx, next) {
ctx.assert(ctx.isAuthenticated(), 401, 'log in required');
const user = ctx.state.user;
const offers = await pg.userOffers(user);
ctx.response.body = offers;
});
router.post('/want', async function wantPost(ctx, next) { router.post('/want', async function wantPost(ctx, next) {
ctx.assert(ctx.isAuthenticated(), 401, 'log in required'); ctx.assert(ctx.isAuthenticated(), 401, 'log in required');
const { releaseId } = ctx.request.body; const { releaseId } = ctx.request.body;
@@ -82,6 +87,14 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
ctx.response.body = wants; ctx.response.body = wants;
}); });
router.get('/want/all', async function wantGet(ctx, next) {
ctx.assert(ctx.isAuthenticated(), 401, 'log in required');
const user = ctx.state.user;
const wants = await pg.wantList(user);
ctx.response.body = wants;
});
router.post('/want/search', async function wantSearch(ctx, next) { router.post('/want/search', async function wantSearch(ctx, next) {
const { query } = ctx.request.body; const { query } = ctx.request.body;
const results = await discogs.search(query); const results = await discogs.search(query);
@@ -107,8 +120,9 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
// log.child... // log.child...
const ws = ctx.websocket; const ws = ctx.websocket;
const rpc = createRpc(log, pg, ws, discogs, offers, events, ctx.state.user as User | null); const rpc = createRpc(log, pg, ws, discogs, offers, ctx.state.user);
if (ctx.state.user) events.emit(Events.Connection, { ws, id: ctx.state.user.id });
ws.on('message', async function incoming(message) { ws.on('message', async function incoming(message) {
try { try {
const parsed = JSON.parse(message.toString()); const parsed = JSON.parse(message.toString());
@@ -126,9 +140,7 @@ export default function createApi(log: Log, pg: Pg, discogs: Discogs, offers: Of
log.info('ws disconnected', { user: ctx.state.user }); log.info('ws disconnected', { user: ctx.state.user });
}); });
if (ctx.state.user) events.emit(Events.Connection, { rpc, id: ctx.state.user.id });
await rpc.onConnection(); await rpc.onConnection();
} catch (e) { } catch (e) {
log.error(e); log.error(e);
} }
api/src/discogs.ts
+1 -1
View File
@@ -48,7 +48,7 @@ export default function createDiscogs(log: Log, pg: Pg) {
// @ts-ignore // @ts-ignore
const additions = results.filter(r => r.status === 'fulfilled').map(r => r.value); const additions = results.filter(r => r.status === 'fulfilled').map(r => r.value);
log.info('want list additions', additions); log.info(additions);
return additions; return additions;
} }
api/src/events.ts
+7 -19
View File
@@ -2,25 +2,22 @@ import { EventEmitter } from 'node:events';
import { setTimeout } from 'timers/promises'; import { setTimeout } from 'timers/promises';
import type Log from 'bunyan'; import type Log from 'bunyan';
import type { Want, Offer } from '@prisma/client'; import type { Want } from '@prisma/client';
import { Pg } from './pg'; import { Pg } from './pg';
import { Rpc } from './rpc';
import { wantDetails } from './utils'; import { wantDetails } from './utils';
import routerAuth from './routers/router.auth'; import routerAuth from './routers/router.auth';
export enum Events { export enum Events {
WantsAdded = 'WantsAdded', WantsAdded = 'WantsAdded',
Sync = 'Sync', StartupSync = 'StartupSync',
ListingsUpdated = 'ListingsUpdated', ListingsUpdated = 'ListingsUpdated',
Connection = 'Connection', Connection = 'Connection',
OffersUpdated = 'OffersUpdated'
} }
export default function createEvents(log: Log, pg: Pg, discogs, offers) { export default function createEvents(log: Log, pg: Pg, discogs, offers) {
const events = new EventEmitter({ captureRejections: true }); const events = new EventEmitter({ captureRejections: true });
const connections = new Map<UUID, Rpc>(); const connections = new Map();
async function populateListings(want: Want) { async function populateListings(want: Want) {
try { try {
@@ -54,12 +51,11 @@ export default function createEvents(log: Log, pg: Pg, discogs, offers) {
log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'starting listings population'); log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'starting listings population');
await updateWantListings(wants); await updateWantListings(wants);
log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'finished populating listings'); log.info({ event: Events.WantsAdded, wants: wants.map(w => wantDetails(w)) }, 'finished populating listings');
events.emit(Events.ListingsUpdated);
}); });
events.on(Events.Sync, async function sync() { events.on(Events.StartupSync, async function startupSync() {
const wants = await pg.wantsToSync(); const wants = await pg.wantsToSync();
log.info({ event: Events.Sync, wants: wants.length }); log.info({ event: Events.StartupSync, wants: wants.length });
await updateWantListings(wants); await updateWantListings(wants);
events.emit(Events.ListingsUpdated); events.emit(Events.ListingsUpdated);
}); });
@@ -69,17 +65,9 @@ export default function createEvents(log: Log, pg: Pg, discogs, offers) {
log.debug({ offers: updatedOffers.length }, 'offers up to date'); log.debug({ offers: updatedOffers.length }, 'offers up to date');
}); });
events.on(Events.Connection, async function onConnection({ rpc, id }) { events.on(Events.Connection, async function onConnection({ ws, id }) {
log.debug('new rpc connection', { id, rpc }); connections.set(id, ws);
connections.set(id, rpc);
}) })
events.on(Events.OffersUpdated, async function onOffersUpdated(offer: Offer) {
const rpc = connections.get(offer.userId);
if (!rpc) return null;
log.debug({ event: Events.OffersUpdated, rpc, offer });
return rpc.sendUserOffers();
});
return events; return events;
} }
api/src/listen.notify.ts
-20
View File
@@ -1,20 +0,0 @@
import createSubscriber from 'pg-listen'
import type Log from 'bunyan';
import { Events } from './events';
export default function createNotify(log: Log, events) {
const CHANNEL = 'events';
const subscriber = createSubscriber({ connectionString: process.env.DATABASE_URL });
subscriber.notifications.on(CHANNEL, ({ table, action, record }) => {
if (table === 'offers') return events.emit(Events.OffersUpdated, record);
})
async function connect() {
await subscriber.connect();
return subscriber.listenTo(CHANNEL);
}
return { connect };
}
api/src/notify.ts
-55
View File
@@ -1,55 +0,0 @@
import createSubscriber from 'pg-listen'
import type Log from 'bunyan';
import { Events } from './events';
import { Pg } from './pg';
export default function createNotify(log: Log, pg: Pg, events) {
const OFFERS_CHANNEL = 'offers.events';
const USERS_CHANNEL = 'users.events';
const LISTINGS_CHANNEL = 'listings.events';
const WANTS_CHANNEL = 'wants.events';
const subscriber = createSubscriber({ connectionString: process.env.DATABASE_URL });
// pg has a hard limit of 8000B for the notification payload
// so we only receive the ids of the updated record
// and go fetch the whole thing to figure out who to notify
async function handleOffers(payload) {
const { action, id } = payload;
log.info({ channel: OFFERS_CHANNEL, action, id });
}
async function handleUsers(payload) {
const { action, id } = payload;
log.info({ channel: USERS_CHANNEL, action, id });
}
async function handleListings(payload) {
const { action, id } = payload;
log.info({ channel: LISTINGS_CHANNEL, action, id });
}
async function handleWants(payload) {
const { action, id } = payload;
log.info({ channel: WANTS_CHANNEL, action, id });
}
subscriber.notifications.on(OFFERS_CHANNEL, handleOffers);
subscriber.notifications.on(USERS_CHANNEL, handleUsers);
subscriber.notifications.on(LISTINGS_CHANNEL, handleListings);
subscriber.notifications.on(WANTS_CHANNEL, handleWants);
async function connect() {
await subscriber.connect();
await Promise.all([
subscriber.listenTo(OFFERS_CHANNEL),
subscriber.listenTo(USERS_CHANNEL),
subscriber.listenTo(LISTINGS_CHANNEL),
subscriber.listenTo(WANTS_CHANNEL),
]);
}
return { connect };
}
api/src/offers.ts
+5 -7
View File
@@ -51,7 +51,8 @@ export default function createOffers(log: Log, pg: Pg) {
// TODO probably need to take one of each condition of record from a store // TODO probably need to take one of each condition of record from a store
// eg. they have a VG+ and a M we should make offers for each // eg. they have a VG+ and a M we should make offers for each
log.trace('generated offers', sorted); log.info(sorted);
const inserts = await pg.offersUpdate(sorted); const inserts = await pg.offersUpdate(sorted);
return inserts; return inserts;
@@ -112,14 +113,12 @@ export default function createOffers(log: Log, pg: Pg) {
const offers = await pg.userOffers(user); const offers = await pg.userOffers(user);
const groups = Object.values(groupBy(offers, (o) => o.wantId)) const groups = Object.values(groupBy(offers, (o) => o.wantId))
.map(g => { .map(g => {
const offers = sortBy(g, sortOffers);
// the offer status is just the most advanced status // the offer status is just the most advanced status
// based on sort // based on sort
const offers = sortBy(g, sortOffers);
const status = offers[0].status; const status = offers[0].status;
// now actually sort them by price
offers.sort((a, b) => a.total - b.total);
const details = offers[0].want.data; const details = offers[0].want.data;
return { return {
@@ -135,8 +134,7 @@ export default function createOffers(log: Log, pg: Pg) {
async function samples() { async function samples() {
const user = await pg.userFindEmail('ntr@mnml.gg'); const user = await pg.userFindEmail('ntr@mnml.gg');
const offerGroups = await userOffers(user); const offerGroups = await userOffers(user);
const i = Math.floor(Math.random() * offerGroups.length / 2); return offerGroups.slice(0, 1);
return offerGroups[i];
} }
return { return {
api/src/pg.ts
+23 -32
View File
@@ -21,10 +21,7 @@ export default function createPg(log: Log, prisma: PrismaClient) {
} }
async function userWants(user: User) { async function userWants(user: User) {
return prisma.want.findMany({ return prisma.want.findMany({ where: { userId: user.id }});
where: { userId: user.id },
include: { _count: { select: { offers: true }} },
});
} }
async function userOffers(user: User) { async function userOffers(user: User) {
@@ -37,7 +34,6 @@ export default function createPg(log: Log, prisma: PrismaClient) {
want: true, want: true,
}, },
orderBy: [ orderBy: [
{ updatedAt: 'asc' },
{ total: 'asc' }, { total: 'asc' },
{ listingId: 'asc' }, { listingId: 'asc' },
], ],
@@ -131,8 +127,8 @@ export default function createPg(log: Log, prisma: PrismaClient) {
const protectedOfferStatuses = [Status.Confirmed, Status.Complete]; const protectedOfferStatuses = [Status.Confirmed, Status.Complete];
// delete all the offers where we don't want to keep them // can't delete a listing with an open offer
// for historical reasons // so delete those offers first
const { count: offersRemoved } = await prisma.offer.deleteMany({ const { count: offersRemoved } = await prisma.offer.deleteMany({
where: { where: {
wantId: want.id, wantId: want.id,
@@ -145,7 +141,7 @@ export default function createPg(log: Log, prisma: PrismaClient) {
} }
}); });
if (offersRemoved > 0) log.info({ offersRemoved }, 'pending offers removed'); if (offersRemoved > 0) log.info({ offersRemoved }, 'open offers removed');
// now we have to filter listingIds with confirmed offers // now we have to filter listingIds with confirmed offers
// and get their listingIds to filter out // and get their listingIds to filter out
@@ -154,26 +150,25 @@ export default function createPg(log: Log, prisma: PrismaClient) {
wantId: want.id, wantId: want.id,
status: { status: {
in: protectedOfferStatuses, in: protectedOfferStatuses,
}, }
}, },
select: { select: {
listingId: true, listingId: true,
}, }
})).map(r => r.listingId); })).map(r => r.listingId);
const removalIds = currentListingIds.filter(id => confirmedListingIds.includes(id)); const removalIds = _.without(currentListingIds, ...confirmedListingIds);
if (removalIds.length) log.info({ removalIds });
// finally we delete listings that aren't related // finally we delete listings that aren't related
// to a historical offer // to a historical offer
const { count } = await prisma.listing.deleteMany({ const { count } = await prisma.listing.deleteMany({
where: { where: {
id: { in: removalIds }, wantId: want.id,
}, id: {
notIn: currentListingIds,
}
}
}); });
log.info({ count }, 'second stage open offers removed');
return count; return count;
}); });
} }
@@ -226,21 +221,17 @@ export default function createPg(log: Log, prisma: PrismaClient) {
// but for ease of abstraction we get the listings themselves // but for ease of abstraction we get the listings themselves
// grouped by seller // grouped by seller
const candidates = await prisma.$queryRaw` const candidates = await prisma.$queryRaw`
WITH groups AS ( select
select seller, count(distinct("wantId")), array_agg(id) as listings
seller, count(distinct("wantId")), array_agg(id) as listings from
from listings
listings where
where seller not in (3709203)
seller not in (3709203) group by
group by seller
seller order by
order by count desc
count desc limit 5;
)
select *
from groups
where count >= 5;
` as BundleCandidate[]; ` as BundleCandidate[];
return Promise.all(candidates.map(async c => prisma.listing.findMany({ return Promise.all(candidates.map(async c => prisma.listing.findMany({
api/src/rpc.ts
+6 -33
View File
@@ -1,3 +1,5 @@
import { EventEmitter } from 'node:events';
import { setTimeout } from 'timers/promises';
import assert from 'assert/strict'; import assert from 'assert/strict';
import type Log from 'bunyan'; import type Log from 'bunyan';
@@ -10,7 +12,6 @@ import type { Offers } from './offers';
import { Status } from './offers'; import { Status } from './offers';
import { isAdmin } from './utils'; import { isAdmin } from './utils';
import { Events } from './events';
function checkMsgType(msgType: RpcMessageType): msgType is RpcMessageType { function checkMsgType(msgType: RpcMessageType): msgType is RpcMessageType {
if (RpcMessageType[msgType]) { if (RpcMessageType[msgType]) {
@@ -20,7 +21,7 @@ function checkMsgType(msgType: RpcMessageType): msgType is RpcMessageType {
} }
// rpc is created per connection from the api // rpc is created per connection from the api
export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers: Offers, events, user: User | null) { export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers: Offers, user: User | null) {
async function ping(): Promise<PongMessage> { async function ping(): Promise<PongMessage> {
return [RpcMessageType.Pong, []]; return [RpcMessageType.Pong, []];
} }
@@ -70,12 +71,6 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
return [RpcMessageType.AcpOffers, await offers.acpOffers()]; return [RpcMessageType.AcpOffers, await offers.acpOffers()];
} }
async function acpListingsSync(): Promise<AcpListingsSyncMessage> {
assert(isAdmin(user), 'not authorised');
events.emit(Events.Sync);
return [RpcMessageType.AcpListingsSync, []];
}
async function receive(message: any): Promise<RpcMessage> { async function receive(message: any): Promise<RpcMessage> {
const [msgType, params] = message; const [msgType, params] = message;
@@ -106,8 +101,6 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
return acpOfferStatusSet(params); return acpOfferStatusSet(params);
case RpcMessageType.AcpOffers: case RpcMessageType.AcpOffers:
return acpOffers(); return acpOffers();
case RpcMessageType.AcpListingsSync:
return acpListingsSync();
default: default:
throw new Error(`Message type ${msgType} is known but unhandled`); throw new Error(`Message type ${msgType} is known but unhandled`);
@@ -120,12 +113,9 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
} }
async function anonConnection() { async function anonConnection() {
const samples = await offers.samples();
} const sampleMsg: OfferSamplesMessage = [RpcMessageType.OfferSamples, samples];
send(sampleMsg);
async function adminConnection() {
// don't need it, requested on route
// send(await acpOffers());
} }
async function onConnection() { async function onConnection() {
@@ -134,13 +124,9 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
const userMsg: UserMessage = [RpcMessageType.User, user]; const userMsg: UserMessage = [RpcMessageType.User, user];
send(userMsg); send(userMsg);
await sendUserOffers();
const wants = await pg.userWants(user); const wants = await pg.userWants(user);
const wantsMsg: WantsMessage = [RpcMessageType.Wants, wants]; const wantsMsg: WantsMessage = [RpcMessageType.Wants, wants];
send(wantsMsg); send(wantsMsg);
if (isAdmin(user)) return adminConnection();
} }
function send(msg: RpcMessage) { function send(msg: RpcMessage) {
@@ -151,23 +137,13 @@ export default function createRpc(log: Log, pg: Pg, ws, discogs: Discogs, offers
)) ))
} }
async function sendUserOffers() {
const userOffers = await offers.userOffers(user);
const offersMsg: OffersMessage = [RpcMessageType.Offers, userOffers];
send(offersMsg);
}
return { return {
receive, receive,
send, send,
onConnection, onConnection,
sendUserOffers,
} }
} }
export type Rpc = ReturnType<typeof createRpc>;
export enum RpcMessageType { export enum RpcMessageType {
Ping = 'Ping', Ping = 'Ping',
Pong = 'Pong', Pong = 'Pong',
@@ -188,7 +164,6 @@ export enum RpcMessageType {
AcpOfferStatusSet = 'AcpOfferStatusSet', AcpOfferStatusSet = 'AcpOfferStatusSet',
AcpOffers = 'AcpOffers', AcpOffers = 'AcpOffers',
AcpListingsSync = 'AcpListingsSync',
WantRm = 'WantRm', WantRm = 'WantRm',
} }
@@ -205,7 +180,6 @@ type OfferSamplesMessage = [RpcMessageType.OfferSamples, Offer[]];
type AcpOfferStatusSetMessage = [RpcMessageType.AcpOfferStatusSet, Offer[]]; type AcpOfferStatusSetMessage = [RpcMessageType.AcpOfferStatusSet, Offer[]];
type AcpOffersMessage = [RpcMessageType.AcpOffers, Offer[]]; type AcpOffersMessage = [RpcMessageType.AcpOffers, Offer[]];
type AcpListingsSyncMessage = [RpcMessageType.AcpListingsSync, []];
export type RpcMessage = export type RpcMessage =
PingMessage | PingMessage |
@@ -222,7 +196,6 @@ export type RpcMessage =
AcpOfferStatusSetMessage | AcpOfferStatusSetMessage |
AcpOffersMessage | AcpOffersMessage |
AcpListingsSyncMessage |
ErrorMessage; ErrorMessage;
api/src/services.ts
+1 -4
View File
@@ -6,22 +6,19 @@ import createLog from './log';
import createApi from './api'; import createApi from './api';
import createEvents from './events'; import createEvents from './events';
import createPg from './pg'; import createPg from './pg';
import createNotify from './notify';
export default function createServices(log) { export default function creates(log) {
const prisma = new PrismaClient(); const prisma = new PrismaClient();
const pg = createPg(log, prisma); const pg = createPg(log, prisma);
const discogs = createDiscogs(log, pg); const discogs = createDiscogs(log, pg);
const offers = createOffers(log, pg); const offers = createOffers(log, pg);
const events = createEvents(log, pg, discogs, offers); const events = createEvents(log, pg, discogs, offers);
const notify = createNotify(log, pg, events);
const api = createApi(log, pg, discogs, offers, events); const api = createApi(log, pg, discogs, offers, events);
return { return {
api, api,
discogs, discogs,
events, events,
notify,
pg, pg,
prisma, prisma,
}; };
client/package-lock.json
Generated
-11
View File
@@ -10,7 +10,6 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@reduxjs/toolkit": "^1.8.5", "@reduxjs/toolkit": "^1.8.5",
"izitoast": "^1.4.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"logrocket": "^3.0.1", "logrocket": "^3.0.1",
"preact": "^10.10.0", "preact": "^10.10.0",
@@ -10845,11 +10844,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/izitoast": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/izitoast/-/izitoast-1.4.0.tgz",
"integrity": "sha512-Oc1X2wiQtPp39i5VpIjf3GJf5sfCtHKXZ5szx7RareyEeFLUlcEW0FSfBni28+Ul6KNKZRKzhVuWzSP4Xngh0w=="
},
"node_modules/jake": { "node_modules/jake": {
"version": "10.8.5", "version": "10.8.5",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
@@ -29572,11 +29566,6 @@
"istanbul-lib-report": "^3.0.0" "istanbul-lib-report": "^3.0.0"
} }
}, },
"izitoast": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/izitoast/-/izitoast-1.4.0.tgz",
"integrity": "sha512-Oc1X2wiQtPp39i5VpIjf3GJf5sfCtHKXZ5szx7RareyEeFLUlcEW0FSfBni28+Ul6KNKZRKzhVuWzSP4Xngh0w=="
},
"jake": { "jake": {
"version": "10.8.5", "version": "10.8.5",
"resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
client/package.json
-1
View File
@@ -10,7 +10,6 @@
}, },
"dependencies": { "dependencies": {
"@reduxjs/toolkit": "^1.8.5", "@reduxjs/toolkit": "^1.8.5",
"izitoast": "^1.4.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"logrocket": "^3.0.1", "logrocket": "^3.0.1",
"preact": "^10.10.0", "preact": "^10.10.0",
client/src/app.tsx
-2
View File
@@ -33,8 +33,6 @@ const Main = () => {
const { ws } = store.getState(); const { ws } = store.getState();
if (!ws) return null; if (!ws) return null;
if (e.url === '/acp') return ws.sendAcpOffers(); if (e.url === '/acp') return ws.sendAcpOffers();
if (e.url === '/') return ws.sendOffers();
if (e.url === '/list') return ws.sendWants();
} }
return ( return (
client/src/components/offer.group.tsx
+1 -5
View File
@@ -58,16 +58,12 @@ function OfferPriceBtn(offer) {
export default function OfferGroup(group, i) { export default function OfferGroup(group, i) {
const ws = useSelector((state: State) => state.ws); const ws = useSelector((state: State) => state.ws);
const format = group.details.formats[0].text ? `${group.details.formats[0].text} - ` : '';
const descriptions = group.details.formats.map(f => f.descriptions.join(' ')).join(' ')
const detailText = `${format} ${descriptions}`;
return ( return (
<div class="offer" key={i}> <div class="offer" key={i}>
<section> <section>
<h3>{group.details.artists_sort} - {group.details.title} <a href={group.details.uri} target="_blank"><ExternalLink /></a></h3> <h3>{group.details.artists_sort} - {group.details.title} <a href={group.details.uri} target="_blank"><ExternalLink /></a></h3>
<div class='alt-text details'> <div class='alt-text details'>
{group.details.year} - {detailText} {group.details.year} - {group.details.formats.map(f => f.descriptions.join(' ')).join(' ')}
</div> </div>
<div class='alt-text details'>Status: {group.status}</div> <div class='alt-text details'>Status: {group.status}</div>
</section> </section>
client/src/components/want.tsx
+2 -2
View File
@@ -30,8 +30,8 @@ function Want(want) {
</div> </div>
<img src={r.thumb} /> <img src={r.thumb} />
<div class='details'> <div class='details'>
<div class='alt'>{r.year} - {r.formats[0].descriptions.join(' ')}</div> <div class='alt'>{r.year}</div>
<div class='alt'>{want._count.offers} offers</div> <div class='alt'>{r.formats[0].descriptions.join(' ')}</div>
</div> </div>
<button onClick={onClick} >{text}</button> <button onClick={onClick} >{text}</button>
</article> </article>
client/src/http.ts
+15 -4
View File
@@ -32,7 +32,21 @@ function onError(error) {
api.interceptors.response.use(onSuccess, onError); api.interceptors.response.use(onSuccess, onError);
const actions = { const actions = {
// TODO move to rpc getBundles: async function getBundles() {
return api.get('/acp/bundles');
},
getOffers: async function getOffers() {
return api.get('/user/offers');
},
getOffersAcp: async function getOffersAcp() {
return api.get('/acp/offers');
},
getWants: async function getWants() {
return api.get('/want/all');
},
postWantSearch: async function postWantSearch(query) { postWantSearch: async function postWantSearch(query) {
return api.post('/want/search', { query }); return api.post('/want/search', { query });
@@ -46,9 +60,6 @@ const actions = {
return api.post('/want/discogs', { username }); return api.post('/want/discogs', { username });
}, },
// --------------------------------
// require as http to set cookies
getLogin: async function getLogin() { getLogin: async function getLogin() {
return api.get('/auth/login') return api.get('/auth/login')
}, },
client/src/index.ts
-2
View File
@@ -1,6 +1,4 @@
import 'izitoast/dist/css/iziToast.min.css';
import './style/index.less'; import './style/index.less';
import App from './app'; import App from './app';
export default App; export default App;
client/src/routes/acp.tsx
+12 -9
View File
@@ -70,18 +70,21 @@ function Home() {
const offers = useSelector((state: State) => state.acpOffers); const offers = useSelector((state: State) => state.acpOffers);
const ws = useSelector((state: State) => state.ws); const ws = useSelector((state: State) => state.ws);
function sync() { // useEffect(() => {
ws.sendAcpListingsSync(); // ws.sendAcpOffers();
// }, [offers, ws]);
if (!offers.length) {
return (
<div class={'offers'}>
loading...
</div>
);
} }
return ( return (
<div> <div class='bundles'>
<button onClick={sync}> sync listings </button> {offers.map(SellerGroup)}
<button onClick={sync}> generate offers </button>
<hr />
<div class='bundles'>
{offers.map(SellerGroup)}
</div>
</div> </div>
); );
} }
client/src/routes/list.tsx
+7 -4
View File
@@ -4,20 +4,23 @@ import { useSelector } from 'react-redux'
import { route } from 'preact-router'; import { route } from 'preact-router';
import { State } from './../store' import { State } from './../store'
import * as toast from './../toast';
import Want from './../components/want'; import Want from './../components/want';
const List = () => { interface Props {
user: any,
wants: any[],
getUserOffers: (userId: string) => void,
}
const List = ({ user }: Props) => {
const wants = useSelector((state: State) => state.wants); const wants = useSelector((state: State) => state.wants);
const user = useSelector((state: State) => state.user);
if (!wants) { if (!wants) {
return <div> loading... </div>; return <div> loading... </div>;
} }
if (!wants.length) { if (!wants.length) {
toast.info('List Empty', 'You have no items in your list, add some with search.');
route('/search'); route('/search');
} }
client/src/routes/login.tsx
+28 -29
View File
@@ -6,19 +6,19 @@ import { useSelector, useDispatch } from 'react-redux'
import http from './../http'; import http from './../http';
import { State, userState } from './../store'; import { State, userState } from './../store';
import Swirl from './../components/swirl'; import Swirl from './../components/swirl';
import OfferGroup from './../components/offer.group';
const Login = ({ mode }) => { const Login = ({ mode }) => {
const dispatch = useDispatch() const dispatch = useDispatch()
const user = useSelector((state: State) => state.user); const user = useSelector((state: State) => state.user);
const ws = useSelector((state: State) => state.ws); const ws = useSelector((state: State) => state.ws);
const [email, setEmail] = useState('')
const [password, setPassword] = useState('');
const [confirmPassword, setConfirmPassword] = useState('');
const [error, setError] = useState(''); const [error, setError] = useState('');
function gotoRegister() { async function postLogin() {
return route('/register');
}
async function postLogin(email, password) {
const [error, user] = await http.postLogin(email, password); const [error, user] = await http.postLogin(email, password);
if (error) return setError(error); if (error) return setError(error);
route('/'); route('/');
@@ -27,23 +27,17 @@ const Login = ({ mode }) => {
ws.connect(); ws.connect();
} }
async function postRegister(email, password, confirm) { async function postRegister() {
if (password !== confirm) return setError('passwords do not match');
const [error, user] = await http.postRegister(email, password); const [error, user] = await http.postRegister(email, password);
if (error) return setError(error); if (error) return setError(error);
route('/search'); route('/search');
dispatch(userState.actions.set(user)); dispatch(userState.actions.set(user));
// reconnect ws to get logged in methods
ws.connect();
} }
function handleSubmit(e) { function handleSubmit(e) {
e.preventDefault(); e.preventDefault();
if (mode === 'login') return postLogin()
console.log(e.target.email, e.target.password, e.target.confirm); if (mode === 'register') return postRegister();
if (mode === 'login') return postLogin(e.target.email.value, e.target.password.value);
if (mode === 'register') return postRegister(e.target.email.value, e.target.password.value, e.target.confirm.value);
} }
const emailRef = useRef<HTMLInputElement>() const emailRef = useRef<HTMLInputElement>()
@@ -59,21 +53,21 @@ const Login = ({ mode }) => {
if (mode === 'register') return ( if (mode === 'register') return (
<div class="login"> <div class="login">
{errorEl} {errorEl}
<form action="" onSubmit={handleSubmit}> <form action="">
<div class="item"> <div class="item">
<label for="email">email</label> <label for="email">email</label>
<input type="email" name="email" id="email" ref={emailRef} required /> <input type="email" name="email" id="email" ref={emailRef} value={email} required onInput={(e) => setEmail((e.target as HTMLInputElement).value)} />
</div> </div>
<div class="item"> <div class="item">
<label for="password">password</label> <label for="password">password</label>
<input type="password" name="password" id="password" required /> <input type="password" name="password" id="password" value={password} required onInput={(e) => setPassword((e.target as HTMLInputElement).value)} />
</div> </div>
<div class="item"> <div class="item">
<label for="password">confirm password</label> <label for="password">confirm password</label>
<input type="password" name="confirm" id="confirm" required /> <input type="password" name="password" id="password" value={confirmPassword} required onInput={(e) => setConfirmPassword((e.target as HTMLInputElement).value)} />
</div> </div>
<div class="item"> <div class="item">
<input type="submit" value="register" /> <input type="submit" value="register" onClick={handleSubmit} />
</div> </div>
</form> </form>
</div> </div>
@@ -83,33 +77,38 @@ const Login = ({ mode }) => {
return ( return (
<div class="login"> <div class="login">
{errorEl} {errorEl}
<form action="" onSubmit={handleSubmit}> <form action="">
<div class="item"> <div class="item">
<label for="email">email</label> <label for="email">email</label>
<input type="email" name="email" id="email" ref={emailRef} /> <input type="email" name="email" id="email" ref={emailRef} value={email} required onInput={(e) => setEmail((e.target as HTMLInputElement).value)} />
</div> </div>
<div class="item"> <div class="item">
<label for="password">password</label> <label for="password">password</label>
<input type="password" name="password" id="password" /> <input type="password" name="password" id="password" value={password} required onInput={(e) => setPassword((e.target as HTMLInputElement).value)} />
</div> </div>
<div class="item"> <div class="item">
<input type="submit" value="login"/> <input type="submit" value="login" onClick={handleSubmit} />
</div> </div>
</form> </form>
<button onClick={gotoRegister}> create account </button>
</div> </div>
); );
}; };
function LoginPage({ mode }) { function LoginPage({ mode }) {
const offers = useSelector((state: State) => state.offers);
return ( return (
<div class="landing"> <div class="landing">
<Login mode={mode} /> <Login mode={mode} />
<Swirl /> <div class='offers'>
<div class='words'> {offers.map(OfferGroup)}
<p>Mates Crates is a record importing service.</p> <div>
<p>We bundle orders together from thousands of online stores to reduce the cost of shipping vinyl.</p> <Swirl />
<p>Records can then be picked up from Preston.</p> <div class='words'>
<p>We bundle orders together from thousands of online stores to reduce the cost of shipping vinyl.</p>
<p>Based in Preston.</p>
</div>
</div>
</div> </div>
</div> </div>
) )
client/src/routes/offers.tsx
+5 -4
View File
@@ -1,17 +1,18 @@
import { h } from 'preact'; import { h } from 'preact';
import { useState, useEffect } from 'preact/hooks';
import { route } from 'preact-router'; import { route } from 'preact-router';
import { useSelector } from 'react-redux' import { useSelector, useDispatch } from 'react-redux'
import { State } from './../store'; import http from './../http';
import * as toast from './../toast'; import { State, offersState } from './../store';
import OfferGroup from './../components/offer.group'; import OfferGroup from './../components/offer.group';
function Home() { function Home() {
const dispatch = useDispatch()
const offers = useSelector((state: State) => state.offers); const offers = useSelector((state: State) => state.offers);
if (offers && offers.length === 0) { if (offers && offers.length === 0) {
toast.info('no offers', 'You have no offers yet, search for some more items.');
route('/search'); route('/search');
} }
client/src/routes/search.tsx
+3 -10
View File
@@ -1,13 +1,10 @@
import { h } from 'preact'; import { h } from 'preact';
import { useState, useRef, useEffect } from 'preact/hooks'; import { useState, useRef, useEffect } from 'preact/hooks';
import { ExternalLink, Check } from 'react-feather'; import { ExternalLink, Check } from 'react-feather';
import { useSelector } from 'react-redux'
import { State } from './../store';
import http from '../http'; import http from '../http';
function Result(r, wants) { function Result(r) {
const [added, setAdded] = useState(false) const [added, setAdded] = useState(false)
async function onClick() { async function onClick() {
@@ -16,9 +13,7 @@ function Result(r, wants) {
setAdded(true); setAdded(true);
} }
const wanted = wants.some(w => w.release === r.id); const classes = `${added ? 'added' : ''}`;
const classes = `${added || wanted ? 'added' : ''}`;
const btnText = added const btnText = added
? <Check /> ? <Check />
: '+'; : '+';
@@ -44,8 +39,6 @@ const User = () => {
const [results, setResults] = useState([]); const [results, setResults] = useState([]);
const [infoText, setInfoText] = useState(''); const [infoText, setInfoText] = useState('');
const wants = useSelector((state: State) => state.wants);
async function fetchResults() { async function fetchResults() {
const [error, results] = await http.postWantSearch(query); const [error, results] = await http.postWantSearch(query);
@@ -113,7 +106,7 @@ const User = () => {
</div> </div>
<div class='results'> <div class='results'>
{infoEl} {infoEl}
{results.map(r => Result(r, wants))} {results.map(Result)}
{topEl} {topEl}
</div> </div>
</div> </div>
client/src/store.tsx
+1 -2
View File
@@ -11,7 +11,7 @@ export const userState = createSlice({
export const offersState = createSlice({ export const offersState = createSlice({
name: 'offers', name: 'offers',
initialState: null, initialState: [],
reducers: { reducers: {
set: (state, action) => action.payload set: (state, action) => action.payload
}, },
@@ -52,7 +52,6 @@ const reducer = combineReducers({
const store = createStore( const store = createStore(
reducer, reducer,
// @ts-ignore -- devtools window exists on dev
window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__() window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
); );
client/src/style/index.less
+3 -23
View File
@@ -217,6 +217,7 @@ button, [type=submit] {
grid-gap: calc(var(--spacing-double) * 2); grid-gap: calc(var(--spacing-double) * 2);
grid-template-areas: grid-template-areas:
"login swirl" "login swirl"
"login sample"
"login words"; "login words";
.login { .login {
@@ -227,8 +228,8 @@ button, [type=submit] {
} }
.swirl { .swirl {
grid-area: swirl; // grid-area: swirl;
height: 15rem; height: 5rem;
} }
.words { .words {
@@ -344,8 +345,6 @@ article {
} }
form { form {
margin-bottom: var(--spacing);
label, input { label, input {
display: block; display: block;
} }
@@ -365,7 +364,6 @@ form {
text-transform: uppercase; text-transform: uppercase;
margin-bottom: var(--spacing-half); margin-bottom: var(--spacing-half);
} }
} }
a { a {
@@ -541,21 +539,3 @@ header {
} }
} }
// ------------
// toasts
.iziToast {
border-radius: 0;
border-color: var(--base-border-color);
.iziToast-body {
font-family: var(--base-font-family);
font-size: var(--base-font-size);
}
.iziToast-title {
font-family: var(--secondary-font-family);
text-transform: uppercase;
}
}
client/src/toast.tsx
-15
View File
@@ -1,15 +0,0 @@
import toast from 'izitoast';
export function info(title, message) {
toast.info({
title,
message,
position: 'bottomCenter',
color: '#1f2128',
titleColor: '#F4F1D0',
messageColor: '#F4F1D0',
iconColor: '#F4F1D0',
icon: '',
theme: 'dark',
});
}
client/src/ws.ts
+4 -8
View File
@@ -1,7 +1,5 @@
import { wantsState, wsState, userState, offersState, acpOffersState } from './store' import { wantsState, wsState, userState, offersState, acpOffersState } from './store'
import * as toast from './toast';
const SOCKET_URL = `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`; const SOCKET_URL = `${window.location.protocol === 'https:' ? 'wss://' : 'ws://'}${window.location.host}/api/ws`;
export default function createSocket(dispatch) { export default function createSocket(dispatch) {
@@ -52,10 +50,6 @@ export default function createSocket(dispatch) {
send(['AcpOfferStatusSet', { id, status }]); send(['AcpOfferStatusSet', { id, status }]);
} }
function sendAcpListingsSync() {
send(['AcpListingsSync', {}]);
}
let pongTimeout; let pongTimeout;
function onPong() { function onPong() {
pongTimeout = setTimeout(sendPing, 5000); pongTimeout = setTimeout(sendPing, 5000);
@@ -90,6 +84,7 @@ export default function createSocket(dispatch) {
Offers: onOffers, Offers: onOffers,
User: onUser, User: onUser,
OfferSamples: onOffers,
AcpOffers: onAcpOffers, AcpOffers: onAcpOffers,
Pong: onPong, Pong: onPong,
@@ -117,6 +112,9 @@ export default function createSocket(dispatch) {
function onOpen() { function onOpen() {
console.log('websocket connected', SOCKET_URL) console.log('websocket connected', SOCKET_URL)
sendPing(); sendPing();
sendAcpOffers();
sendOffers();
sendWants();
} }
function onError(event) { function onError(event) {
@@ -157,10 +155,8 @@ export default function createSocket(dispatch) {
sendWantRm, sendWantRm,
sendOffers, sendOffers,
sendWants,
sendAcpOffers, sendAcpOffers,
sendAcpOfferStatusSet, sendAcpOfferStatusSet,
sendAcpListingsSync,
}; };
} }