This is something one of my side projects aims to fix. Basically make a programmable battery source out of 18650 cells, USB Type-C, with automated charge & discharge control to keep it between 30-80% for UPS or Solar augmented use cases