Skip to content

Commit ca4261d

Browse files
nuclearacenuclearace
committed
work on fixing for latest version
1 parent 6eafce0 commit ca4261d

File tree

4 files changed

+44
-103
lines changed

4 files changed

+44
-103
lines changed

‎Socket.IO-Client-Swift.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -126,68 +126,40 @@
126126
remoteGlobalIDString = 576349FA1BD9B46A00E19CD7;
127127
remoteInfo = "SocketIO-tvOS";
128128
};
129-
745225EC1F1BA89E007EA874 /* PBXContainerItemProxy */ = {
130-
isa = PBXContainerItemProxy;
131-
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
132-
proxyType = 1;
133-
remoteGlobalIDString = 6B3E79E519D48B7F006071F7;
134-
remoteInfo = "Starscream iOS";
135-
};
136-
74638B631F111CD000F5E1FF /* PBXContainerItemProxy */ = {
137-
isa = PBXContainerItemProxy;
138-
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
139-
proxyType = 2;
140-
remoteGlobalIDString = 6B3E79E619D48B7F006071F7;
141-
remoteInfo = "Starscream iOS";
142-
};
143-
74638B651F111CD000F5E1FF /* PBXContainerItemProxy */ = {
144-
isa = PBXContainerItemProxy;
145-
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
146-
proxyType = 2;
147-
remoteGlobalIDString = 6B3E79F119D48B7F006071F7;
148-
remoteInfo = "Starscream iOSTests";
149-
};
150-
74638B671F111CD000F5E1FF /* PBXContainerItemProxy */ = {
129+
74B3C8391F7F3ECE007D96C8 /* PBXContainerItemProxy */ = {
151130
isa = PBXContainerItemProxy;
152131
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
153132
proxyType = 2;
154-
remoteGlobalIDString = D9C3E35F19E48FF1009FC285;
155-
remoteInfo = "Starscream OSX";
133+
remoteGlobalIDString = 33CCF0921F5DDC030099B092;
134+
remoteInfo = StarscreamSocketIO;
156135
};
157-
74638B691F111CD000F5E1FF /* PBXContainerItemProxy */ = {
136+
74B3C83B1F7F3ECE007D96C8 /* PBXContainerItemProxy */ = {
158137
isa = PBXContainerItemProxy;
159138
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
160139
proxyType = 2;
161-
remoteGlobalIDString = D9C3E36919E48FF1009FC285;
162-
remoteInfo = "Starscream OSXTests";
140+
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
141+
remoteInfo = "Starscream Tests";
163142
};
164-
74638B6B1F111CD000F5E1FF /* PBXContainerItemProxy */ = {
143+
74B3C8411F7F3F93007D96C8 /* PBXContainerItemProxy */ = {
165144
isa = PBXContainerItemProxy;
166145
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
167-
proxyType = 2;
168-
remoteGlobalIDString = 091277971BD673A70003036D;
169-
remoteInfo = "Starscream tvOS";
170-
};
171-
74638B6D1F111CD000F5E1FF /* PBXContainerItemProxy */ = {
172-
isa = PBXContainerItemProxy;
173-
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
174-
proxyType = 2;
175-
remoteGlobalIDString = 091277A01BD673A70003036D;
176-
remoteInfo = "Starscream tvOSTests";
146+
proxyType = 1;
147+
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
148+
remoteInfo = StarscreamSocketIO;
177149
};
178-
74638B711F111CF100F5E1FF /* PBXContainerItemProxy */ = {
150+
74B3C8431F7F3F98007D96C8 /* PBXContainerItemProxy */ = {
179151
isa = PBXContainerItemProxy;
180152
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
181153
proxyType = 1;
182-
remoteGlobalIDString = D9C3E35E19E48FF1009FC285;
183-
remoteInfo = "Starscream OSX";
154+
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
155+
remoteInfo = StarscreamSocketIO;
184156
};
185-
74638B731F111CF600F5E1FF /* PBXContainerItemProxy */ = {
157+
74B3C8451F7F3F9C007D96C8 /* PBXContainerItemProxy */ = {
186158
isa = PBXContainerItemProxy;
187159
containerPortal = 74638B5A1F111CD000F5E1FF /* Starscream.xcodeproj */;
188160
proxyType = 1;
189-
remoteGlobalIDString = 091277961BD673A70003036D;
190-
remoteInfo = "Starscream tvOS";
161+
remoteGlobalIDString = 33CCF0841F5DDC030099B092;
162+
remoteInfo = StarscreamSocketIO;
191163
};
192164
/* End PBXContainerItemProxy section */
193165

@@ -436,12 +408,8 @@
436408
74638B5B1F111CD000F5E1FF /* Products */ = {
437409
isa = PBXGroup;
438410
children = (
439-
74638B641F111CD000F5E1FF /* StarscreamSocketIO.framework */,
440-
74638B661F111CD000F5E1FF /* Starscream iOSTests.xctest */,
441-
74638B681F111CD000F5E1FF /* StarscreamSocketIO.framework */,
442-
74638B6A1F111CD000F5E1FF /* Starscream OSXTests.xctest */,
443-
74638B6C1F111CD000F5E1FF /* StarscreamSocketIO.framework */,
444-
74638B6E1F111CD000F5E1FF /* Starscream tvOSTests.xctest */,
411+
74B3C83A1F7F3ECE007D96C8 /* StarscreamSocketIO.framework */,
412+
74B3C83C1F7F3ECE007D96C8 /* Starscream Tests.xctest */,
445413
);
446414
name = Products;
447415
sourceTree = "<group>";
@@ -550,7 +518,7 @@
550518
buildRules = (
551519
);
552520
dependencies = (
553-
745225ED1F1BA89E007EA874 /* PBXTargetDependency */,
521+
74B3C8461F7F3F9C007D96C8 /* PBXTargetDependency */,
554522
);
555523
name = "SocketIO-iOS";
556524
productName = "SocketIO-iOS";
@@ -587,7 +555,7 @@
587555
buildRules = (
588556
);
589557
dependencies = (
590-
74638B721F111CF100F5E1FF /* PBXTargetDependency */,
558+
74B3C8441F7F3F98007D96C8 /* PBXTargetDependency */,
591559
);
592560
name = "SocketIO-Mac";
593561
productName = "SocketIO-Mac";
@@ -624,7 +592,7 @@
624592
buildRules = (
625593
);
626594
dependencies = (
627-
74638B741F111CF600F5E1FF /* PBXTargetDependency */,
595+
74B3C8421F7F3F93007D96C8 /* PBXTargetDependency */,
628596
);
629597
name = "SocketIO-tvOS";
630598
productName = "SocketIO-iOS";
@@ -704,46 +672,18 @@
704672
/* End PBXProject section */
705673

706674
/* Begin PBXReferenceProxy section */
707-
74638B641F111CD000F5E1FF /* StarscreamSocketIO.framework */ = {
708-
isa = PBXReferenceProxy;
709-
fileType = wrapper.framework;
710-
path = StarscreamSocketIO.framework;
711-
remoteRef = 74638B631F111CD000F5E1FF /* PBXContainerItemProxy */;
712-
sourceTree = BUILT_PRODUCTS_DIR;
713-
};
714-
74638B661F111CD000F5E1FF /* Starscream iOSTests.xctest */ = {
715-
isa = PBXReferenceProxy;
716-
fileType = wrapper.cfbundle;
717-
path = "Starscream iOSTests.xctest";
718-
remoteRef = 74638B651F111CD000F5E1FF /* PBXContainerItemProxy */;
719-
sourceTree = BUILT_PRODUCTS_DIR;
720-
};
721-
74638B681F111CD000F5E1FF /* StarscreamSocketIO.framework */ = {
722-
isa = PBXReferenceProxy;
723-
fileType = wrapper.framework;
724-
path = StarscreamSocketIO.framework;
725-
remoteRef = 74638B671F111CD000F5E1FF /* PBXContainerItemProxy */;
726-
sourceTree = BUILT_PRODUCTS_DIR;
727-
};
728-
74638B6A1F111CD000F5E1FF /* Starscream OSXTests.xctest */ = {
729-
isa = PBXReferenceProxy;
730-
fileType = wrapper.cfbundle;
731-
path = "Starscream OSXTests.xctest";
732-
remoteRef = 74638B691F111CD000F5E1FF /* PBXContainerItemProxy */;
733-
sourceTree = BUILT_PRODUCTS_DIR;
734-
};
735-
74638B6C1F111CD000F5E1FF /* StarscreamSocketIO.framework */ = {
675+
74B3C83A1F7F3ECE007D96C8 /* StarscreamSocketIO.framework */ = {
736676
isa = PBXReferenceProxy;
737677
fileType = wrapper.framework;
738678
path = StarscreamSocketIO.framework;
739-
remoteRef = 74638B6B1F111CD000F5E1FF /* PBXContainerItemProxy */;
679+
remoteRef = 74B3C8391F7F3ECE007D96C8 /* PBXContainerItemProxy */;
740680
sourceTree = BUILT_PRODUCTS_DIR;
741681
};
742-
74638B6E1F111CD000F5E1FF /* Starscream tvOSTests.xctest */ = {
682+
74B3C83C1F7F3ECE007D96C8 /* Starscream Tests.xctest */ = {
743683
isa = PBXReferenceProxy;
744684
fileType = wrapper.cfbundle;
745-
path = "Starscream tvOSTests.xctest";
746-
remoteRef = 74638B6D1F111CD000F5E1FF /* PBXContainerItemProxy */;
685+
path = "Starscream Tests.xctest";
686+
remoteRef = 74B3C83B1F7F3ECE007D96C8 /* PBXContainerItemProxy */;
747687
sourceTree = BUILT_PRODUCTS_DIR;
748688
};
749689
/* End PBXReferenceProxy section */
@@ -936,20 +876,20 @@
936876
target = 576349FA1BD9B46A00E19CD7 /* SocketIO-tvOS */;
937877
targetProxy = 57634A3D1BD9B4B800E19CD7 /* PBXContainerItemProxy */;
938878
};
939-
745225ED1F1BA89E007EA874 /* PBXTargetDependency */ = {
879+
74B3C8421F7F3F93007D96C8 /* PBXTargetDependency */ = {
940880
isa = PBXTargetDependency;
941-
name = "Starscream iOS";
942-
targetProxy = 745225EC1F1BA89E007EA874 /* PBXContainerItemProxy */;
881+
name = StarscreamSocketIO;
882+
targetProxy = 74B3C8411F7F3F93007D96C8 /* PBXContainerItemProxy */;
943883
};
944-
74638B721F111CF100F5E1FF /* PBXTargetDependency */ = {
884+
74B3C8441F7F3F98007D96C8 /* PBXTargetDependency */ = {
945885
isa = PBXTargetDependency;
946-
name = "Starscream OSX";
947-
targetProxy = 74638B711F111CF100F5E1FF /* PBXContainerItemProxy */;
886+
name = StarscreamSocketIO;
887+
targetProxy = 74B3C8431F7F3F98007D96C8 /* PBXContainerItemProxy */;
948888
};
949-
74638B741F111CF600F5E1FF /* PBXTargetDependency */ = {
889+
74B3C8461F7F3F9C007D96C8 /* PBXTargetDependency */ = {
950890
isa = PBXTargetDependency;
951-
name = "Starscream tvOS";
952-
targetProxy = 74638B731F111CF600F5E1FF /* PBXContainerItemProxy */;
891+
name = StarscreamSocketIO;
892+
targetProxy = 74B3C8451F7F3F9C007D96C8 /* PBXContainerItemProxy */;
953893
};
954894
/* End PBXTargetDependency section */
955895

‎Source/SocketIO/Engine/SocketEngine.swift‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,21 +310,22 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
310310

311311
private func createWebSocketAndConnect() {
312312
ws?.delegate = nil // TODO this seems a bit defensive, is this really needed?
313-
ws = WebSocket(url: urlWebSocketWithSid)
313+
var request = URLRequest(url: urlWebSocketWithSid)
314314

315315
if cookies != nil {
316316
let headers = HTTPCookie.requestHeaderFields(with: cookies!)
317317
for (key, value) in headers {
318-
ws?.headers[key] = value
318+
request.setValue(value, forHTTPHeaderField: key)
319319
}
320320
}
321321

322322
if extraHeaders != nil {
323323
for (headerName, value) in extraHeaders! {
324-
ws?.headers[headerName] = value
324+
request.setValue(value, forHTTPHeaderField: headerName)
325325
}
326326
}
327327

328+
ws = WebSocket(request: request)
328329
ws?.callbackQueue = engineQueue
329330
ws?.enableCompression = compress
330331
ws?.delegate = self
@@ -604,7 +605,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
604605
// MARK: Starscream delegate conformance
605606

606607
/// Delegate method for connection.
607-
public func websocketDidConnect(socket: WebSocket) {
608+
public func websocketDidConnect(socket: WebSocketClient) {
608609
if !forceWebsockets {
609610
probing = true
610611
probeWebSocket()
@@ -616,7 +617,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
616617
}
617618

618619
/// Delegate method for disconnection.
619-
public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
620+
public func websocketDidDisconnect(socket: WebSocketClient, error: Error?) {
620621
probing = false
621622

622623
if closed {

‎Source/SocketIO/Engine/SocketEngineWebsocket.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ extension SocketEngineWebsocket {
6868
// MARK: Starscream delegate methods
6969

7070
/// Delegate method for when a message is received.
71-
public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
71+
public func websocketDidReceiveMessage(socket: WebSocketClient, text: String) {
7272
parseEngineMessage(text)
7373
}
7474

7575
/// Delegate method for when binary is received.
76-
public func websocketDidReceiveData(socket: WebSocket, data: Data) {
76+
public func websocketDidReceiveData(socket: WebSocketClient, data: Data) {
7777
parseEngineData(data)
7878
}
7979
}

‎Source/Starscream‎

0 commit comments

Comments
 (0)