Skip to content

feat: iOS TLS fix — defer startTLS until didConnectToHost #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manoaxcend wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feat: iOS TLS fix — defer startTLS until didConnectToHost #217

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9edaa0
feat: iOS TLS fix — defer startTLS until didConnectToHost
realmano Jul 14, 2025
91c2c1c
chore: updated package name and version for npm publish
realmano Jul 14, 2025
78e8581
updated package name
realmano Jun 1, 2026
f4f38bf
Reset package.json
Rapsssito Jun 9, 2026
ddd563c
Reset json
Rapsssito Jun 9, 2026
466f409
Apply suggestions from code review
Rapsssito Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ios/TcpSocketClient.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ @interface TcpSocketClient () {
long _sendTag;
SecTrustRef _peerTrust;
SecIdentityRef _clientIdentity;
NSDictionary *_tlsOptionsPending;
}

- (id)initWithClientId:(NSNumber *)clientID
Expand Down Expand Up @@ -163,7 +164,7 @@ - (BOOL)connect:(NSString *)host
error:error];
}
if (result && tlsOptions) {
[self startTLS:tlsOptions];
_tlsOptionsPending = [tlsOptions copy]; // Save for later
}
return result;
}
Expand Down Expand Up @@ -571,9 +572,15 @@ - (void)socket:(GCDAsyncSocket *)sock
return;
}

// Show up if SSL handsake is done
// Show up if SSL handshake is done
if (!_tls) {
[_clientDelegate onConnect:self];
if (_tlsOptionsPending) {
[self startTLS:_tlsOptionsPending];
_tlsOptionsPending = nil;
} else {
[_clientDelegate onConnect:self];
_connecting = false;
}
}
[sock readDataWithTimeout:-1 tag:_id.longValue];
}
Expand Down