Skip to content

Commit f93fb79

Browse files
danielrbrownedanielrbrowne
authored
Merge pull request #313 from pusher/feature/310-reconnection-improvements
WebSocket reconnection improvements
2 parents a2dc4fe + 1a8cff1 commit f93fb79

File tree

21 files changed

+44
-170
lines changed

21 files changed

+44
-170
lines changed

‎Cartfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
github "ashleymills/Reachability.swift" ~> 5.0.0
21
github "bitmark-inc/tweetnacl-swiftwrap" ~> 1.0
3-
github "pusher/NWWebSocket" ~> 0.3.0
2+
github "pusher/NWWebSocket" ~> 0.5.0

‎Cartfile.resolved

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
github "ashleymills/Reachability.swift" "v5.0.0"
21
github "bitmark-inc/tweetnacl-swiftwrap" "1.0.2"
3-
github "pusher/NWWebSocket" "0.3.0"
2+
github "pusher/NWWebSocket" "0.5.0"

‎Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@
461461
inputFileListPaths = (
462462
);
463463
inputPaths = (
464-
Reachability,
465464
PusherSwift,
466465
NWWebSocket,
467466
);
@@ -483,7 +482,6 @@
483482
);
484483
inputPaths = (
485484
TweetNacl,
486-
Reachability,
487485
PusherSwiftWithEncryption,
488486
NWWebSocket,
489487
);
@@ -505,7 +503,6 @@
505503
);
506504
inputPaths = (
507505
TweetNacl,
508-
Reachability,
509506
PusherSwiftWithEncryption,
510507
NWWebSocket,
511508
);
@@ -526,7 +523,6 @@
526523
inputFileListPaths = (
527524
);
528525
inputPaths = (
529-
Reachability,
530526
PusherSwift,
531527
NWWebSocket,
532528
);
@@ -547,7 +543,6 @@
547543
inputFileListPaths = (
548544
);
549545
inputPaths = (
550-
Reachability,
551546
PusherSwift,
552547
NWWebSocket,
553548
);
@@ -568,7 +563,6 @@
568563
inputFileListPaths = (
569564
);
570565
inputPaths = (
571-
Reachability,
572566
PusherSwiftWithEncryption,
573567
TweetNacl,
574568
NWWebSocket,

‎Consumption-Tests/Carthage-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,6 @@
485485
files = (
486486
);
487487
inputPaths = (
488-
Reachability,
489488
PusherSwift,
490489
NWWebSocket,
491490
);
@@ -504,7 +503,6 @@
504503
inputFileListPaths = (
505504
);
506505
inputPaths = (
507-
Reachability,
508506
PusherSwift,
509507
NWWebSocket,
510508
);
@@ -524,7 +522,6 @@
524522
);
525523
inputPaths = (
526524
TweetNacl,
527-
Reachability,
528525
PusherSwiftWithEncryption,
529526
NWWebSocket,
530527
);
@@ -544,7 +541,6 @@
544541
);
545542
inputPaths = (
546543
TweetNacl,
547-
Reachability,
548544
PusherSwiftWithEncryption,
549545
NWWebSocket,
550546
);
@@ -565,7 +561,6 @@
565561
inputFileListPaths = (
566562
);
567563
inputPaths = (
568-
Reachability,
569564
PusherSwift,
570565
NWWebSocket,
571566
);
@@ -586,7 +581,6 @@
586581
inputFileListPaths = (
587582
);
588583
inputPaths = (
589-
Reachability,
590584
PusherSwiftWithEncryption,
591585
TweetNacl,
592586
NWWebSocket,

‎Consumption-Tests/Carthage-Minimum/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@
461461
inputFileListPaths = (
462462
);
463463
inputPaths = (
464-
Reachability,
465464
PusherSwift,
466465
NWWebSocket,
467466
);
@@ -483,7 +482,6 @@
483482
);
484483
inputPaths = (
485484
TweetNacl,
486-
Reachability,
487485
PusherSwiftWithEncryption,
488486
NWWebSocket,
489487
);
@@ -505,7 +503,6 @@
505503
);
506504
inputPaths = (
507505
TweetNacl,
508-
Reachability,
509506
PusherSwiftWithEncryption,
510507
NWWebSocket,
511508
);
@@ -526,7 +523,6 @@
526523
inputFileListPaths = (
527524
);
528525
inputPaths = (
529-
Reachability,
530526
PusherSwift,
531527
NWWebSocket,
532528
);
@@ -547,7 +543,6 @@
547543
inputFileListPaths = (
548544
);
549545
inputPaths = (
550-
Reachability,
551546
PusherSwift,
552547
NWWebSocket,
553548
);
@@ -568,7 +563,6 @@
568563
inputFileListPaths = (
569564
);
570565
inputPaths = (
571-
Reachability,
572566
PusherSwiftWithEncryption,
573567
TweetNacl,
574568
NWWebSocket,

‎Consumption-Tests/Carthage-Minimum/Swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,6 @@
485485
files = (
486486
);
487487
inputPaths = (
488-
Reachability,
489488
PusherSwift,
490489
NWWebSocket,
491490
);
@@ -504,7 +503,6 @@
504503
inputFileListPaths = (
505504
);
506505
inputPaths = (
507-
Reachability,
508506
PusherSwift,
509507
NWWebSocket,
510508
);
@@ -524,7 +522,6 @@
524522
);
525523
inputPaths = (
526524
TweetNacl,
527-
Reachability,
528525
PusherSwiftWithEncryption,
529526
NWWebSocket,
530527
);
@@ -544,7 +541,6 @@
544541
);
545542
inputPaths = (
546543
TweetNacl,
547-
Reachability,
548544
PusherSwiftWithEncryption,
549545
NWWebSocket,
550546
);
@@ -565,7 +561,6 @@
565561
inputFileListPaths = (
566562
);
567563
inputPaths = (
568-
Reachability,
569564
PusherSwift,
570565
NWWebSocket,
571566
);
@@ -586,7 +581,6 @@
586581
inputFileListPaths = (
587582
);
588583
inputPaths = (
589-
Reachability,
590584
PusherSwiftWithEncryption,
591585
TweetNacl,
592586
NWWebSocket,

‎Consumption-Tests/Cocoapods-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,11 @@
538538
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-iOS-WithoutEncryption/Pods-ObjectiveC-iOS-WithoutEncryption-frameworks.sh",
539539
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
540540
"${BUILT_PRODUCTS_DIR}/PusherSwift-iOS/PusherSwift.framework",
541-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
542541
);
543542
name = "[CP] Embed Pods Frameworks";
544543
outputPaths = (
545544
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
546545
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
547-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
548546
);
549547
runOnlyForDeploymentPostprocessing = 0;
550548
shellPath = /bin/sh;
@@ -648,13 +646,11 @@
648646
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-macOS-WithoutEncryption/Pods-ObjectiveC-macOS-WithoutEncryption-frameworks.sh",
649647
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
650648
"${BUILT_PRODUCTS_DIR}/PusherSwift-macOS/PusherSwift.framework",
651-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
652649
);
653650
name = "[CP] Embed Pods Frameworks";
654651
outputPaths = (
655652
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
656653
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
657-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
658654
);
659655
runOnlyForDeploymentPostprocessing = 0;
660656
shellPath = /bin/sh;
@@ -734,14 +730,12 @@
734730
inputPaths = (
735731
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-iOS-WithEncryption/Pods-ObjectiveC-iOS-WithEncryption-frameworks.sh",
736732
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
737-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
738733
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-iOS/PusherSwiftWithEncryption.framework",
739734
"${BUILT_PRODUCTS_DIR}/TweetNacl-iOS/TweetNacl.framework",
740735
);
741736
name = "[CP] Embed Pods Frameworks";
742737
outputPaths = (
743738
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
744-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
745739
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
746740
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
747741
);
@@ -759,13 +753,11 @@
759753
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-tvOS-WithoutEncryption/Pods-ObjectiveC-tvOS-WithoutEncryption-frameworks.sh",
760754
"${BUILT_PRODUCTS_DIR}/NWWebSocket-tvOS/NWWebSocket.framework",
761755
"${BUILT_PRODUCTS_DIR}/PusherSwift-tvOS/PusherSwift.framework",
762-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-tvOS/Reachability.framework",
763756
);
764757
name = "[CP] Embed Pods Frameworks";
765758
outputPaths = (
766759
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
767760
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
768-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
769761
);
770762
runOnlyForDeploymentPostprocessing = 0;
771763
shellPath = /bin/sh;
@@ -780,14 +772,12 @@
780772
inputPaths = (
781773
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-tvOS-WithEncryption/Pods-ObjectiveC-tvOS-WithEncryption-frameworks.sh",
782774
"${BUILT_PRODUCTS_DIR}/NWWebSocket-tvOS/NWWebSocket.framework",
783-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-tvOS/Reachability.framework",
784775
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-tvOS/PusherSwiftWithEncryption.framework",
785776
"${BUILT_PRODUCTS_DIR}/TweetNacl-tvOS/TweetNacl.framework",
786777
);
787778
name = "[CP] Embed Pods Frameworks";
788779
outputPaths = (
789780
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
790-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
791781
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
792782
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
793783
);
@@ -848,14 +838,12 @@
848838
inputPaths = (
849839
"${PODS_ROOT}/Target Support Files/Pods-ObjectiveC-macOS-WithEncryption/Pods-ObjectiveC-macOS-WithEncryption-frameworks.sh",
850840
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
851-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
852841
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-macOS/PusherSwiftWithEncryption.framework",
853842
"${BUILT_PRODUCTS_DIR}/TweetNacl-macOS/TweetNacl.framework",
854843
);
855844
name = "[CP] Embed Pods Frameworks";
856845
outputPaths = (
857846
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
858-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
859847
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
860848
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
861849
);

‎Consumption-Tests/Cocoapods-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -563,14 +563,12 @@
563563
inputPaths = (
564564
"${PODS_ROOT}/Target Support Files/Pods-Swift-tvOS-WithEncryption/Pods-Swift-tvOS-WithEncryption-frameworks.sh",
565565
"${BUILT_PRODUCTS_DIR}/NWWebSocket-tvOS/NWWebSocket.framework",
566-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-tvOS/Reachability.framework",
567566
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-tvOS/PusherSwiftWithEncryption.framework",
568567
"${BUILT_PRODUCTS_DIR}/TweetNacl-tvOS/TweetNacl.framework",
569568
);
570569
name = "[CP] Embed Pods Frameworks";
571570
outputPaths = (
572571
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
573-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
574572
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
575573
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
576574
);
@@ -626,14 +624,12 @@
626624
inputPaths = (
627625
"${PODS_ROOT}/Target Support Files/Pods-Swift-macOS-WithEncryption/Pods-Swift-macOS-WithEncryption-frameworks.sh",
628626
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
629-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
630627
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-macOS/PusherSwiftWithEncryption.framework",
631628
"${BUILT_PRODUCTS_DIR}/TweetNacl-macOS/TweetNacl.framework",
632629
);
633630
name = "[CP] Embed Pods Frameworks";
634631
outputPaths = (
635632
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
636-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
637633
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
638634
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
639635
);
@@ -734,13 +730,11 @@
734730
"${PODS_ROOT}/Target Support Files/Pods-Swift-macOS-WithoutEncryption/Pods-Swift-macOS-WithoutEncryption-frameworks.sh",
735731
"${BUILT_PRODUCTS_DIR}/NWWebSocket-macOS/NWWebSocket.framework",
736732
"${BUILT_PRODUCTS_DIR}/PusherSwift-macOS/PusherSwift.framework",
737-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-macOS/Reachability.framework",
738733
);
739734
name = "[CP] Embed Pods Frameworks";
740735
outputPaths = (
741736
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
742737
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
743-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
744738
);
745739
runOnlyForDeploymentPostprocessing = 0;
746740
shellPath = /bin/sh;
@@ -756,13 +750,11 @@
756750
"${PODS_ROOT}/Target Support Files/Pods-Swift-tvOS-WithoutEncryption/Pods-Swift-tvOS-WithoutEncryption-frameworks.sh",
757751
"${BUILT_PRODUCTS_DIR}/NWWebSocket-tvOS/NWWebSocket.framework",
758752
"${BUILT_PRODUCTS_DIR}/PusherSwift-tvOS/PusherSwift.framework",
759-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-tvOS/Reachability.framework",
760753
);
761754
name = "[CP] Embed Pods Frameworks";
762755
outputPaths = (
763756
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
764757
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
765-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
766758
);
767759
runOnlyForDeploymentPostprocessing = 0;
768760
shellPath = /bin/sh;
@@ -843,14 +835,12 @@
843835
inputPaths = (
844836
"${PODS_ROOT}/Target Support Files/Pods-Swift-iOS-WithEncryption/Pods-Swift-iOS-WithEncryption-frameworks.sh",
845837
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
846-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
847838
"${BUILT_PRODUCTS_DIR}/PusherSwiftWithEncryption-iOS/PusherSwiftWithEncryption.framework",
848839
"${BUILT_PRODUCTS_DIR}/TweetNacl-iOS/TweetNacl.framework",
849840
);
850841
name = "[CP] Embed Pods Frameworks";
851842
outputPaths = (
852843
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
853-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
854844
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwiftWithEncryption.framework",
855845
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
856846
);
@@ -933,13 +923,11 @@
933923
"${PODS_ROOT}/Target Support Files/Pods-Swift-iOS-WithoutEncryption/Pods-Swift-iOS-WithoutEncryption-frameworks.sh",
934924
"${BUILT_PRODUCTS_DIR}/NWWebSocket-iOS/NWWebSocket.framework",
935925
"${BUILT_PRODUCTS_DIR}/PusherSwift-iOS/PusherSwift.framework",
936-
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift-iOS/Reachability.framework",
937926
);
938927
name = "[CP] Embed Pods Frameworks";
939928
outputPaths = (
940929
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NWWebSocket.framework",
941930
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PusherSwift.framework",
942-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
943931
);
944932
runOnlyForDeploymentPostprocessing = 0;
945933
shellPath = /bin/sh;

0 commit comments

Comments
 (0)