Oil edges higher on tight supply, China demand recovery optimism