(feat) improve the connectivity service logic