D4V2 USB charging somehow?

I’ve seen a D4V2 modded quite heavily to include a USB type C charger. Is there a less permanent way of achieving a USB rechargeable D4V2? An EDC light needs to be ready at all times without downtime, the need to assemble it first hinders readiness as opposed to just unplugging a cable.

Is there a K1 or K9.3 style 18650 tube that would fit the D4V2? I wouldn’t mind the extra length in exchange for easy charging.

D4SV2 would be fine too.