Cruise from Shanghai

Hi - I am travelling to from Singapore --> Shanghai (1 day stay) and then boarding a cruise from Shanghai --> Japan ---> Shanghai with then a 3 day stay before travelling back to Singapore. My current understanding is I would be able to get the 144 visa-free transit twice (when entering Shanghai by flight and then when entering Shanghai by cruise ship because in the first instance, I will be coming to Shanghai from Singapore and then leaving for Japan and then in the second instance I will be coming to Shanghai from Japan and leaving for Singapore). Am I correct in my thinking? Thanks in advance!