WIP don’t use private APIs in closeAndFinish

test/common/modules/shared_helper.js

@@ -226,20 +226,18 @@ define([
     }
 
     _callbackOnClose(realtime, callback) {
-      this.recordPrivateApi('read.connectionManager.activeProtocol');
-      if (!realtime.connection.connectionManager.activeProtocol) {
+      if (realtime.connection.state === 'closed' || realtime.connection.state === 'failed') {
         this.recordPrivateApi('call.Platform.nextTick');
         platform.Config.nextTick(function () {
-          realtime.close();
           callback();
         });
         return;
       }
-      this.recordPrivateApi('read.connectionManager.activeProtocol.transport');
-      this.recordPrivateApi('listen.transport.disposed');
-      realtime.connection.connectionManager.activeProtocol.transport.on('disposed', function () {
+
+      realtime.connection.once(['closed', 'failed'], function () {
         callback();
       });
+
       /* wait a tick before closing in order to avoid the final close
        * happening synchronously in a publish/attach callback, which
        * complicates channelattach_publish_invalid etc. */