Eligible travel?

Hi there,

I plan to travel from Canada, to Shanghai, then on to Japan, then back to Canada. My ticket is booked as Canada to Shanghai, and Tokyo to Canada, with a one way ticket purchased Shanghai to Osaka. From what I've read, we should be fine for the 144hr visa, but your thoughts?

Thank you.