diff --git a/AcuantCamera/AcuantCamera.xcodeproj/project.pbxproj b/AcuantCamera/AcuantCamera.xcodeproj/project.pbxproj index adec171..42fece4 100644 --- a/AcuantCamera/AcuantCamera.xcodeproj/project.pbxproj +++ b/AcuantCamera/AcuantCamera.xcodeproj/project.pbxproj @@ -43,6 +43,7 @@ D9B4821926BC4EE2001C0CEC /* BarcodeCameraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9B4821826BC4EE2001C0CEC /* BarcodeCameraViewController.swift */; }; D9B4821B26C18DC6001C0CEC /* BarcodeCameraDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9B4821A26C18DC6001C0CEC /* BarcodeCameraDelegate.swift */; }; D9B4821D26C18F1D001C0CEC /* BarcodeCaptureDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9B4821C26C18F1D001C0CEC /* BarcodeCaptureDelegate.swift */; }; + D9D18E6E27BAA47E0048293A /* CGRectExtn.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D18E6D27BAA47E0048293A /* CGRectExtn.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -84,6 +85,7 @@ D9B4821826BC4EE2001C0CEC /* BarcodeCameraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarcodeCameraViewController.swift; sourceTree = ""; }; D9B4821A26C18DC6001C0CEC /* BarcodeCameraDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarcodeCameraDelegate.swift; sourceTree = ""; }; D9B4821C26C18F1D001C0CEC /* BarcodeCaptureDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarcodeCaptureDelegate.swift; sourceTree = ""; }; + D9D18E6D27BAA47E0048293A /* CGRectExtn.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGRectExtn.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -125,6 +127,7 @@ 8327AA4C2420165200B524F9 /* Camera */, 8327AA4A2420099B00B524F9 /* Extension */, 134F59D521FA0BA600CEDBFC /* AcuantCamera.h */, + 8387E1FF243284440051AF80 /* Media.xcassets */, 134F59D621FA0BA600CEDBFC /* Info.plist */, ); path = AcuantCamera; @@ -165,7 +168,6 @@ 8327AA3C2420081100B524F9 /* OCR */, 8327AA192420056700B524F9 /* AcuantMrzCaptureSession.swift */, 8327AA182420056700B524F9 /* AcuantMrzCameraController.swift */, - 8387E1FF243284440051AF80 /* Media.xcassets */, ); path = Mrz; sourceTree = ""; @@ -200,6 +202,7 @@ D95FF40F266FC7E30054E7B9 /* UIWindowExtn.swift */, D95FF413267177A60054E7B9 /* UILayerExtn.swift */, D95FF41526727D760054E7B9 /* StringExtn.swift */, + D9D18E6D27BAA47E0048293A /* CGRectExtn.swift */, ); path = Extension; sourceTree = ""; @@ -330,6 +333,7 @@ files = ( D9B4821B26C18DC6001C0CEC /* BarcodeCameraDelegate.swift in Sources */, D95FF410266FC7E30054E7B9 /* UIWindowExtn.swift in Sources */, + D9D18E6E27BAA47E0048293A /* CGRectExtn.swift in Sources */, C2743A26222DE2E700302CE7 /* CaptureConstants.swift in Sources */, 8327AA452420081100B524F9 /* AcuantMrzResult.swift in Sources */, 8327AA422420081100B524F9 /* AcuantMrzParser.swift in Sources */, diff --git a/AcuantCamera/AcuantCamera/Camera/Barcode/BarcodeCameraViewController.swift b/AcuantCamera/AcuantCamera/Camera/Barcode/BarcodeCameraViewController.swift index da71e96..f709381 100644 --- a/AcuantCamera/AcuantCamera/Camera/Barcode/BarcodeCameraViewController.swift +++ b/AcuantCamera/AcuantCamera/Camera/Barcode/BarcodeCameraViewController.swift @@ -85,10 +85,7 @@ import AVFoundation } private func createBarcodeLayer() -> DocumentPlaceholderLayer? { - guard let barcodeImage = UIImage(named: "barcode_placement_overlay", - in: Bundle(for: BarcodeCameraViewController.self), - compatibleWith: nil) - else { + guard let barcodeImage = getPlaceholderImage() else { return nil } @@ -97,6 +94,21 @@ import AVFoundation return barcodeLayer } + private func getPlaceholderImage() -> UIImage? { + if let image = UIImage(named: "barcode_placement_overlay", + in: Bundle(for: BarcodeCameraViewController.self), + compatibleWith: nil) { + return image + } else if let bundlePath = Bundle(for: BarcodeCameraViewController.self).path(forResource: "AcuantCameraAssets", + ofType: "bundle"), + let bundle = Bundle(path: bundlePath), let image = UIImage(named: "barcode_placement_overlay", + in: bundle, + compatibleWith: nil) { + return image + } + return nil + } + private func scheduleTimeoutTimer(_ timeout: Int) -> Timer { return Timer.scheduledTimer(withTimeInterval: TimeInterval(timeout), repeats: false) { [weak self] _ in guard let self = self else { return } diff --git a/AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift b/AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift index c254d25..3ec83ff 100644 --- a/AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift +++ b/AcuantCamera/AcuantCamera/Camera/Document/DocumentCameraController.swift @@ -36,21 +36,18 @@ import AcuantCommon private var currentPoints: [CGPoint]? private var options: CameraOptions! weak private var cameraCaptureDelegate: CameraCaptureDelegate? - - private var currentState = FrameResult.NO_DOCUMENT + private var captureTimerState = 0.0 private var isHoldSteady = false private var holdSteadyTimer: Timer! private let captureTime = 1 private let documentMovementThreshold = 25 - private let previewBoundsThreshold: CGFloat = -5 private var currentStateCount = 0 - private var nextState = FrameResult.NO_DOCUMENT private var isNavigationHidden = false - public class func getCameraController(delegate:CameraCaptureDelegate, cameraOptions: CameraOptions)->DocumentCameraController{ + public class func getCameraController(delegate: CameraCaptureDelegate, cameraOptions: CameraOptions) -> DocumentCameraController { let c = DocumentCameraController() c.cameraCaptureDelegate = delegate c.options = cameraOptions @@ -169,7 +166,7 @@ import AcuantCommon : .resizeAspect createCameraLayers() - + self.cameraPreviewView.layer.addSublayer(self.messageLayer) self.cameraPreviewView.layer.addSublayer(self.shapeLayer) self.cameraPreviewView.layer.addSublayer(self.cornerLayer) @@ -183,20 +180,18 @@ import AcuantCommon } private func createCameraLayers() { - if self.messageLayer == nil { - self.messageLayer = CameraTextView(autoCapture: autoCapture) + if messageLayer == nil { + messageLayer = CameraTextView(autoCapture: autoCapture) } - self.messageLayer.setFrame(frame: self.view.frame) - if self.cornerLayer == nil { - self.cornerLayer = CameraCornerOverlayView(options: options) + if cornerLayer == nil { + cornerLayer = CameraCornerOverlayView(options: options) } - self.cornerLayer.setFrame(frame: self.view.frame) if shapeLayer == nil { shapeLayer = CameraDocumentOverlayView(options: options) } } - public func rotateImage(image: UIImage) -> UIImage{ + public func rotateImage(image: UIImage) -> UIImage { if UIDevice.current.orientation == UIDeviceOrientation.landscapeRight { return image.rotate(radians: .pi/2)! } @@ -318,7 +313,7 @@ import AcuantCommon } else { let interval = getInterval(time: self.captureTimerState, duration: self.captureIntervalInSeconds) - if interval >= self.captureWaitTime - 1 { + if interval >= self.captureWaitTime { self.captureSession.enableCapture() } else { self.messageLayer.string = "\(self.captureWaitTime - interval)..." @@ -330,47 +325,32 @@ import AcuantCommon self.handleInterval() } - public func isDocumentMoved(newPoints: Array) -> Bool{ - if(self.currentPoints != nil && newPoints.count == self.currentPoints!.count){ - for i in 0.. documentMovementThreshold || Int(abs(self.currentPoints![i].y - newPoints[i].y)) > documentMovementThreshold ){ - return true - } + public func isDocumentMoved(points: [CGPoint]) -> Bool { + guard let currentPoints = self.currentPoints, points.count == currentPoints.count else { + return false + } + + for i in 0.. documentMovementThreshold + || Int(abs(currentPoints[i].y - points[i].y)) > documentMovementThreshold ) { + return true } } + return false } - - + private func transitionState(state: CameraState, localString: String? = nil) { - if (!autoCapture) { + if !autoCapture { return } - if(localString != nil){ - self.cancelCapture(state: state, message: NSLocalizedString(localString!, comment: "")) - } - else{ + if let localString = localString { + self.cancelCapture(state: state, message: NSLocalizedString(localString, comment: "")) + } else { self.setLookFromState(state: state) } } - - func isInRange(point: CGPoint) -> Bool { - return (point.x >= -previewBoundsThreshold && point.x <= self.cameraPreviewView.frame.width + previewBoundsThreshold) - && (point.y >= -previewBoundsThreshold && point.y <= self.cameraPreviewView.frame.height + previewBoundsThreshold) - } - - func isOutsideView(points: Array?) -> Bool { - if(points != nil && points?.count == 4 && autoCapture){ - let scaledPoints = scalePoints(points: points!) - for i in scaledPoints { - if(!isInRange(point: i)){ - return true - } - } - } - return false - } private func scalePoints(points: Array) -> Array{ return [ @@ -414,7 +394,7 @@ import AcuantCommon } } - internal func addNavigationBackButton(){ + func addNavigationBackButton() { backButton = UIButton(frame: CGRect(x: 0, y: UIScreen.main.heightOfSafeArea()*0.065, width: 90, height: 40)) var attribs : [NSAttributedString.Key : Any?] = [:] @@ -431,7 +411,7 @@ import AcuantCommon self.view.addSubview(backButton) } - @objc internal func backTapped(_ sender: Any){ + @objc func backTapped(_ sender: Any) { self.cameraCaptureDelegate?.setCapturedImage(image: Image(), barcodeString: nil) self.navigationController?.popViewController(animated: true) } @@ -447,11 +427,10 @@ extension DocumentCameraController: DocumentCaptureDelegate { if self.autoCapture { self.setLookFromState(state: DocumentCameraController.CameraState.Capture) self.setMessageCaptureSettings() - self.messageLayer.string = NSLocalizedString("1...", comment: "") } else { self.setMessageDefaultSettings() - self.messageLayer.string = NSLocalizedString("acuant_camera_capturing", comment: "") } + self.messageLayer.string = NSLocalizedString("acuant_camera_capturing", comment: "") self.captured = true } } @@ -480,29 +459,23 @@ extension DocumentCameraController: FrameAnalysisDelegate { return } - if isOutsideView(points: points) { - self.currentState = FrameResult.DOCUMENT_NOT_IN_FRAME - } else{ - self.currentState = frameResult - } - - switch self.currentState { - case FrameResult.NO_DOCUMENT: + switch frameResult { + case .NO_DOCUMENT: self.transitionState(state: CameraState.Align, localString: "acuant_camera_align") - case FrameResult.SMALL_DOCUMENT: + case .SMALL_DOCUMENT: self.transitionState(state: CameraState.MoveCloser, localString: "acuant_camera_move_closer") - case FrameResult.BAD_ASPECT_RATIO: + case .BAD_ASPECT_RATIO: self.transitionState(state: CameraState.MoveCloser, localString: "acuant_camera_move_closer") - case FrameResult.DOCUMENT_NOT_IN_FRAME: + case .DOCUMENT_NOT_IN_FRAME: self.transitionState(state: CameraState.MoveCloser, localString: "acuant_camera_outside_view") - case FrameResult.GOOD_DOCUMENT: + case .GOOD_DOCUMENT: if let pts = points, pts.count == 4, autoCapture { let scaledPoints = scalePoints(points: pts) self.setPath(points: scaledPoints) if !isHoldSteady { self.transitionState(state: CameraState.Hold) - if self.isDocumentMoved(newPoints: scaledPoints) { + if self.isDocumentMoved(points: scaledPoints) { self.cancelCapture(state: CameraState.Steady, message: NSLocalizedString("acuant_camera_hold_steady", comment: "")) } else if !self.captured { self.triggerCapture() diff --git a/AcuantCamera/AcuantCamera/Camera/Document/DocumentCaptureSession.swift b/AcuantCamera/AcuantCamera/Camera/Document/DocumentCaptureSession.swift index 3458492..acb9a28 100644 --- a/AcuantCamera/AcuantCamera/Camera/Document/DocumentCaptureSession.swift +++ b/AcuantCamera/AcuantCamera/Camera/Document/DocumentCaptureSession.swift @@ -12,32 +12,32 @@ import AVFoundation import AcuantCommon import AcuantImagePreparation -@objcMembers public class DocumentCaptureSession :AVCaptureSession,AVCaptureMetadataOutputObjectsDelegate,AVCaptureVideoDataOutputSampleBufferDelegate,AVCapturePhotoCaptureDelegate{ +@objcMembers public class DocumentCaptureSession: AVCaptureSession { let stillImageOutput = AVCapturePhotoOutput() - var croppedFrame : Image? = nil - var stringValue : String? = nil + var croppedFrame: Image? + var stringValue: String? var captureDevice: AVCaptureDevice? var shouldShowBorder = true - weak var delegate : DocumentCaptureDelegate? = nil + weak var delegate: DocumentCaptureDelegate? private let context = CIContext() private let DEFAULT_FRAME_THRESHOLD = 1 private let FAST_FRAME_THRESHOLD = 3 private let TOO_SLOW_FOR_AUTO_CAPTURE = 130 - private var frameCounter = 0 + private let VIDEO_ZOOM_FACTOR = 1.6 private var autoCapture = true - weak private var autoCaptureDelegate: AutoCaptureDelegate? = nil + weak private var autoCaptureDelegate: AutoCaptureDelegate? private var captureEnabled = true private var captured = false private var cropping = false private var times = [-1, -1, -1] private var finishedTest = false - private var input : AVCaptureDeviceInput? = nil - private var videoOutput : AVCaptureVideoDataOutput? = nil - private var captureMetadataOutput : AVCaptureMetadataOutput? = nil + private var input: AVCaptureDeviceInput? + private var videoOutput: AVCaptureVideoDataOutput! + private var captureMetadataOutput: AVCaptureMetadataOutput! private var devicePreviewResolutionLongerSide = CaptureConstants.CAMERA_PREVIEW_LONGER_SIDE_STANDARD - weak private var frameDelegate:FrameAnalysisDelegate? = nil + weak private var frameDelegate: FrameAnalysisDelegate? public override init() { super.init() @@ -46,76 +46,88 @@ import AcuantImagePreparation } } - public class func getDocumentCaptureSession(delegate:DocumentCaptureDelegate?, frameDelegate: FrameAnalysisDelegate, autoCaptureDelegate:AutoCaptureDelegate, captureDevice:AVCaptureDevice?)-> DocumentCaptureSession{ - return DocumentCaptureSession().getDocumentCaptureSession(delegate: delegate!, frameDelegate: frameDelegate, autoCaptureDelegate: autoCaptureDelegate, captureDevice: captureDevice) + public class func getDocumentCaptureSession(delegate: DocumentCaptureDelegate?, + frameDelegate: FrameAnalysisDelegate, + autoCaptureDelegate: AutoCaptureDelegate, + captureDevice: AVCaptureDevice?) -> DocumentCaptureSession { + return DocumentCaptureSession().getDocumentCaptureSession(delegate: delegate!, + frameDelegate: frameDelegate, + autoCaptureDelegate: autoCaptureDelegate, + captureDevice: captureDevice) } - private func getDocumentCaptureSession(delegate:DocumentCaptureDelegate?, frameDelegate:FrameAnalysisDelegate, autoCaptureDelegate:AutoCaptureDelegate, captureDevice: AVCaptureDevice?)->DocumentCaptureSession{ + private func getDocumentCaptureSession(delegate: DocumentCaptureDelegate?, + frameDelegate: FrameAnalysisDelegate, + autoCaptureDelegate: AutoCaptureDelegate, + captureDevice: AVCaptureDevice?) -> DocumentCaptureSession { self.delegate = delegate self.captureDevice = captureDevice self.frameDelegate = frameDelegate self.autoCaptureDelegate = autoCaptureDelegate self.autoCapture = autoCaptureDelegate.getAutoCapture() - return self; + return self } - public func enableCapture(){ + public func enableCapture() { self.captureEnabled = true self.captured = true self.capturePhoto() - DispatchQueue.main.async{ + DispatchQueue.main.async { self.delegate?.readyToCapture() } } public func start() { + guard let videoDevice = captureDevice else { + return + } + self.automaticallyConfiguresApplicationAudioSession = false - self.usesApplicationAudioSession = false - if(self.captureDevice?.isFocusModeSupported(.continuousAutoFocus))! { - try? self.captureDevice?.lockForConfiguration() - self.captureDevice?.focusMode = .continuousAutoFocus - self.captureDevice?.unlockForConfiguration() - } - do { - self.input = try AVCaptureDeviceInput(device: self.captureDevice!) - if(self.canAddInput(self.input!)){ - self.addInput(self.input!) - } - } catch _ as NSError { - return - } - - self.sessionPreset = AVCaptureSession.Preset.photo + self.usesApplicationAudioSession = false + if videoDevice.isFocusModeSupported(.continuousAutoFocus) { + try? videoDevice.lockForConfiguration() + videoDevice.focusMode = .continuousAutoFocus + videoDevice.unlockForConfiguration() + } + + self.input = try? AVCaptureDeviceInput(device: videoDevice) + if let input = self.input, self.canAddInput(input) { + self.addInput(input) + } + + self.sessionPreset = .photo - if let formatDescription = self.captureDevice?.activeFormat.formatDescription { - let dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription) - self.devicePreviewResolutionLongerSide = max(Int(dimensions.width),Int(dimensions.height)) - } + let formatDescription = videoDevice.activeFormat.formatDescription + let dimensions = CMVideoFormatDescriptionGetDimensions(formatDescription) + self.devicePreviewResolutionLongerSide = max(Int(dimensions.width), Int(dimensions.height)) - self.videoOutput = AVCaptureVideoDataOutput() - self.videoOutput?.alwaysDiscardsLateVideoFrames = true - let frameQueue = DispatchQueue(label: "com.acuant.frame.queue",qos:.userInteractive,attributes:.concurrent) - self.videoOutput?.setSampleBufferDelegate(self, queue: frameQueue) - if(self.canAddOutput(self.videoOutput!)){ - self.addOutput(self.videoOutput!) - } - if(self.canAddOutput(self.stillImageOutput)){ - self.stillImageOutput.isLivePhotoCaptureEnabled = false - self.addOutput(self.stillImageOutput) - } - - /* Check for metadata */ - self.captureMetadataOutput = AVCaptureMetadataOutput() - let metadataQueue = DispatchQueue(label: "com.acuant.metadata.queue",qos:.userInteractive,attributes:.concurrent) - self.captureMetadataOutput?.setMetadataObjectsDelegate(self, queue: metadataQueue) - if (self.canAddOutput(self.captureMetadataOutput!)) { - self.addOutput(self.captureMetadataOutput!) - self.captureMetadataOutput?.metadataObjectTypes = [.pdf417] - } + self.videoOutput = AVCaptureVideoDataOutput() + self.videoOutput.alwaysDiscardsLateVideoFrames = true + let frameQueue = DispatchQueue(label: "com.acuant.frame.queue", qos: .userInteractive, attributes: .concurrent) + self.videoOutput.setSampleBufferDelegate(self, queue: frameQueue) + if self.canAddOutput(self.videoOutput){ + self.addOutput(self.videoOutput) + } + if self.canAddOutput(self.stillImageOutput) { + self.stillImageOutput.isLivePhotoCaptureEnabled = false + self.addOutput(self.stillImageOutput) + } + + self.captureMetadataOutput = AVCaptureMetadataOutput() + let metadataQueue = DispatchQueue(label: "com.acuant.metadata.queue", qos: .userInteractive, attributes: .concurrent) + self.captureMetadataOutput.setMetadataObjectsDelegate(self, queue: metadataQueue) + if self.canAddOutput(self.captureMetadataOutput) { + self.addOutput(self.captureMetadataOutput) + self.captureMetadataOutput.metadataObjectTypes = [.pdf417] + } self.startRunning() + try? videoDevice.lockForConfiguration() + if videoDevice.maxAvailableVideoZoomFactor >= VIDEO_ZOOM_FACTOR { + videoDevice.videoZoomFactor = VIDEO_ZOOM_FACTOR + } + videoDevice.unlockForConfiguration() } - - // MARK: Sample buffer to UIImage conversion + private func imageFromSampleBuffer(sampleBuffer: CMSampleBuffer) -> UIImage? { guard let imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else { return nil } let ciImage = CIImage(cvPixelBuffer: imageBuffer) @@ -123,91 +135,44 @@ import AcuantImagePreparation return UIImage(cgImage: cgImage) } - // MARK: AVCaptureVideoDataOutputSampleBufferDelegate - public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) { - let frameQueue = DispatchQueue(label: "com.acuant.image.queue",attributes:.concurrent) - frameQueue.async { - let frame = self.imageFromSampleBuffer(sampleBuffer: sampleBuffer) - if(frame != nil && self.captured == false){ - if(self.cropping || self.captured){ - return - } - if(self.autoCapture == false){ - return - } - self.cropping = true - let startTime = CACurrentMediaTime() - self.croppedFrame = self.detectImage(image: frame!) - let elapsed = CACurrentMediaTime() - startTime - - if (!self.finishedTest) { - for i in 0 ..< self.times.count { - if (self.times[i] == -1) { - self.times[i] = Int(elapsed * 1000) - if (i == self.times.count - 1) { - break - } else { - self.cropping = false - return - } - } - } - } - - if (!self.times.contains(-1)) { - self.finishedTest = true; - if(self.times.min() ?? (self.TOO_SLOW_FOR_AUTO_CAPTURE + 10) > self.TOO_SLOW_FOR_AUTO_CAPTURE) { - self.autoCapture = false; - self.autoCaptureDelegate?.setAutoCapture(autoCapture: false) - return - } - } + private func getFrameResult(basedOn detectedImage: Image?, + frame: UIImage, + smallerDocumentDPIRatio: Double, + largerDocumentDPIRatio: Double) -> (frameResult: FrameResult, scaledPoints: [CGPoint]) { + guard let croppedFrame = detectedImage else { + return (.NO_DOCUMENT, []) + } - let frameSize = frame!.size - - DispatchQueue.main.async { [weak self] in - guard let self = self else { return } - - let croppedImage = self.croppedFrame - var frameResult: FrameResult - var scaledPoints = Array() - var MANDATORY_RESOLUTION_THRESHOLD = CaptureConstants.MANDATORY_RESOLUTION_THRESHOLD_DEFAULT - - if let croppedImg = croppedImage { - if self.isDocumentAligned(croppedImg.points), self.shouldShowBorder { - croppedImg.points.forEach{ point in - var scaled: CGPoint = CGPoint() - scaled.x = point.x/frameSize.width as CGFloat - scaled.y = point.y/frameSize.height as CGFloat - scaledPoints.append(scaled) - } - } - - if croppedImg.isPassport { - MANDATORY_RESOLUTION_THRESHOLD = Int(Double(frameSize.width) * CaptureConstants.CAMERA_PRIVEW_LARGER_DOCUMENT_DPI_RATIO) - } else { - MANDATORY_RESOLUTION_THRESHOLD = Int(Double(frameSize.width) * CaptureConstants.CAMERA_PRIVEW_SMALLER_DOCUMENT_DPI_RATIO) - } - } + let frameSize = frame.size + var scaledPoints = [CGPoint]() + var resolutionThreshold = CaptureConstants.MANDATORY_RESOLUTION_THRESHOLD_DEFAULT - if(croppedImage == nil || croppedImage!.error?.errorCode == AcuantErrorCodes.ERROR_CouldNotCrop || (croppedImage!.dpi) < CaptureConstants.NO_DOCUMENT_DPI_THRESHOLD){ - frameResult = FrameResult.NO_DOCUMENT - self.frameCounter = 0 - }else if(croppedImage!.error?.errorCode == AcuantErrorCodes.ERROR_LowResolutionImage && (croppedImage!.dpi) < MANDATORY_RESOLUTION_THRESHOLD){ - frameResult = FrameResult.SMALL_DOCUMENT - self.frameCounter = 0 - }else if(croppedImage!.isCorrectAspectRatio == false){ - frameResult = FrameResult.BAD_ASPECT_RATIO - self.frameCounter = 0 - }else{ - frameResult = FrameResult.GOOD_DOCUMENT - } - - self.frameDelegate?.onFrameAvailable(frameResult: frameResult, points: scaledPoints) - self.cropping = false - } + if self.isDocumentAligned(croppedFrame.points), self.shouldShowBorder { + croppedFrame.points.forEach{ point in + var scaled: CGPoint = CGPoint() + scaled.x = point.x/frameSize.width as CGFloat + scaled.y = point.y/frameSize.height as CGFloat + scaledPoints.append(scaled) } } + + if croppedFrame.isPassport { + resolutionThreshold = Int(Double(frameSize.width) * largerDocumentDPIRatio) + } else { + resolutionThreshold = Int(Double(frameSize.width) * smallerDocumentDPIRatio) + } + + if croppedFrame.error?.errorCode == AcuantErrorCodes.ERROR_CouldNotCrop || croppedFrame.dpi < CaptureConstants.NO_DOCUMENT_DPI_THRESHOLD { + return (.NO_DOCUMENT, scaledPoints) + } else if croppedFrame.error?.errorCode == AcuantErrorCodes.ERROR_LowResolutionImage, croppedFrame.dpi < resolutionThreshold { + return (.SMALL_DOCUMENT, scaledPoints) + } else if !croppedFrame.isCorrectAspectRatio { + return (.BAD_ASPECT_RATIO, scaledPoints) + } else if CGRect(points: croppedFrame.points) != nil { + return (.GOOD_DOCUMENT, scaledPoints) + } else { + return (.DOCUMENT_NOT_IN_FRAME, scaledPoints) + } } public func getFrameMatchThreshold(cropDuration: Double) -> Int{ @@ -219,23 +184,102 @@ import AcuantImagePreparation } } - public func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) { - if let metadataObject = metadataObjects.first { - guard let readableObject = metadataObject as? AVMetadataMachineReadableCodeObject else { return } - if(readableObject.stringValue == nil){ + func capturePhoto() { + let photoSetting = AVCapturePhotoSettings.init(format: [AVVideoCodecKey: AVVideoCodecType.jpeg]) + if #available(iOS 13.0, *) { + photoSetting.photoQualityPrioritization = .quality + } else { + photoSetting.isAutoStillImageStabilizationEnabled = true + } + self.stillImageOutput.capturePhoto(with: photoSetting, delegate: self) + } + + func detectImage(image: UIImage) -> Image? { + let detectData = DetectData.newInstance(image: image) + + let croppedImage = ImagePreparation.detect(detectData: detectData) + return croppedImage + } + + private func isDocumentAligned(_ points: [CGPoint]) -> Bool { + guard points.count == 4 else { + return false + } + + return abs(points[1].x - points[3].x) > abs(points[1].y - points[3].y) + } +} + +//MARK: - AVCaptureVideoDataOutputSampleBufferDelegate + +extension DocumentCaptureSession: AVCaptureVideoDataOutputSampleBufferDelegate { + + public func captureOutput(_ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection) { + guard let frame = imageFromSampleBuffer(sampleBuffer: sampleBuffer), !captured, !cropping, autoCapture else { + return + } + + cropping = true + let startTime = CACurrentMediaTime() + croppedFrame = detectImage(image: frame) + let elapsed = CACurrentMediaTime() - startTime + + if !finishedTest { + for i in 0 ..< self.times.count { + if self.times[i] == -1 { + self.times[i] = Int(elapsed * 1000) + if i == times.count - 1 { + break + } else { + cropping = false + return + } + } + } + } + + if !times.contains(-1) { + finishedTest = true + if times.min() ?? TOO_SLOW_FOR_AUTO_CAPTURE + 10 > TOO_SLOW_FOR_AUTO_CAPTURE { + autoCapture = false + autoCaptureDelegate?.setAutoCapture(autoCapture: false) return } - self.stringValue = readableObject.stringValue + } + + DispatchQueue.main.async { [weak self] in + guard let self = self else { return } + + let result = self.getFrameResult(basedOn: self.croppedFrame, + frame: frame, + smallerDocumentDPIRatio: CaptureConstants.CAMERA_PRIVEW_SMALLER_DOCUMENT_DPI_RATIO, + largerDocumentDPIRatio: CaptureConstants.CAMERA_PRIVEW_LARGER_DOCUMENT_DPI_RATIO) + self.frameDelegate?.onFrameAvailable(frameResult: result.frameResult, points: result.scaledPoints) + self.cropping = false } } + +} + +//MARK: - AVCaptureMetadataOutputObjectsDelegate + +extension DocumentCaptureSession: AVCaptureMetadataOutputObjectsDelegate { - func found2DBarcode(code: String,image:Image!) { - if(self.captured == false){ - self.capturePhoto() + public func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) { + guard let mrco = metadataObjects.first as? AVMetadataMachineReadableCodeObject, + let stringValue = mrco.stringValue else { + return } + + self.stringValue = stringValue } - - + +} + +//MARK: - AVCapturePhotoCaptureDelegate + +extension DocumentCaptureSession: AVCapturePhotoCaptureDelegate { + public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) { // Check if there is any error in capturing guard error == nil else { @@ -255,37 +299,12 @@ import AcuantImagePreparation return } - DispatchQueue.main.async{ + DispatchQueue.main.async { self.captureDevice = nil self.stopRunning() - self.delegate?.documentCaptured(image: capturedImage, barcodeString:self.stringValue) + self.delegate?.documentCaptured(image: capturedImage, barcodeString: self.stringValue) self.delegate = nil } } - - - func capturePhoto() { - let photoSetting = AVCapturePhotoSettings.init(format: [AVVideoCodecKey: AVVideoCodecType.jpeg]) - if #available(iOS 13.0, *) { - photoSetting.photoQualityPrioritization = .quality - } else { - photoSetting.isAutoStillImageStabilizationEnabled = true - } - self.stillImageOutput.capturePhoto(with: photoSetting, delegate: self) - } - - func detectImage(image:UIImage)->Image?{ - let detectData = DetectData.newInstance(image: image) - - let croppedImage = ImagePreparation.detect(detectData: detectData) - return croppedImage - } - private func isDocumentAligned(_ points: [CGPoint]) -> Bool { - guard points.count == 4 else { - return false - } - - return abs(points[1].x - points[3].x) > abs(points[1].y - points[3].y) - } } diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/AcuantMrzCameraController.swift b/AcuantCamera/AcuantCamera/Camera/Mrz/AcuantMrzCameraController.swift index 28a901d..8baa0e0 100644 --- a/AcuantCamera/AcuantCamera/Camera/Mrz/AcuantMrzCameraController.swift +++ b/AcuantCamera/AcuantCamera/Camera/Mrz/AcuantMrzCameraController.swift @@ -316,19 +316,26 @@ import AcuantCommon if shapeLayer == nil { shapeLayer = CameraDocumentOverlayView(options: options) } - if imageLayer == nil, let image = getPlaceholderImage() { - self.imageLayer = DocumentPlaceholderLayer(image: image, bounds: self.view.frame) + if imageLayer == nil { + self.imageLayer = DocumentPlaceholderLayer(image: getPlaceholderImage() ?? UIImage(), bounds: self.view.frame) } } - + private func getPlaceholderImage() -> UIImage? { if self.options.defaultImageUrl.isEmpty { - return UIImage(named: "Passport_placement_Overlay", - in: Bundle(for: AcuantMrzCameraController.self), - compatibleWith: nil) - } else { - return UIImage(named: self.options.defaultImageUrl) + if let image = UIImage(named: "Passport_placement_Overlay", + in: Bundle(for: AcuantMrzCameraController.self), + compatibleWith: nil) { + return image + } else if let bundlePath = Bundle(for: AcuantMrzCameraController.self).path(forResource: "AcuantCameraAssets", + ofType: "bundle"), + let bundle = Bundle(path: bundlePath), let image = UIImage(named: "Passport_placement_Overlay", + in: bundle, + compatibleWith: nil) { + return image + } } + return UIImage(named: self.options.defaultImageUrl) } public func exitTimer(){ diff --git a/AcuantCamera/AcuantCamera/Extension/CGRectExtn.swift b/AcuantCamera/AcuantCamera/Extension/CGRectExtn.swift new file mode 100644 index 0000000..04953f8 --- /dev/null +++ b/AcuantCamera/AcuantCamera/Extension/CGRectExtn.swift @@ -0,0 +1,28 @@ +// +// CGRectExtn.swift +// AcuantCamera +// +// Created by Federico Nicoli on 14/2/22. +// Copyright © 2022 Acuant. All rights reserved. +// + +extension CGRect { + + init?(points: [CGPoint]) { + let xArray = points.map(\.x) + let yArray = points.map(\.y) + if let minX = xArray.min(), + let maxX = xArray.max(), + let minY = yArray.min(), + let maxY = yArray.max() { + + self.init(x: minX, + y: minY, + width: maxX - minX, + height: maxY - minY) + } else { + return nil + } + } + +} diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Contents.json b/AcuantCamera/AcuantCamera/Media.xcassets/Contents.json similarity index 100% rename from AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Contents.json rename to AcuantCamera/AcuantCamera/Media.xcassets/Contents.json diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Passport_placement_Overlay.imageset/Contents.json b/AcuantCamera/AcuantCamera/Media.xcassets/Passport_placement_Overlay.imageset/Contents.json similarity index 100% rename from AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Passport_placement_Overlay.imageset/Contents.json rename to AcuantCamera/AcuantCamera/Media.xcassets/Passport_placement_Overlay.imageset/Contents.json diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Passport_placement_Overlay.imageset/Passport_placement_Overlay.png b/AcuantCamera/AcuantCamera/Media.xcassets/Passport_placement_Overlay.imageset/Passport_placement_Overlay.png similarity index 100% rename from AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/Passport_placement_Overlay.imageset/Passport_placement_Overlay.png rename to AcuantCamera/AcuantCamera/Media.xcassets/Passport_placement_Overlay.imageset/Passport_placement_Overlay.png diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/barcode_placement_overlay.imageset/Contents.json b/AcuantCamera/AcuantCamera/Media.xcassets/barcode_placement_overlay.imageset/Contents.json similarity index 100% rename from AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/barcode_placement_overlay.imageset/Contents.json rename to AcuantCamera/AcuantCamera/Media.xcassets/barcode_placement_overlay.imageset/Contents.json diff --git a/AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/barcode_placement_overlay.imageset/barcode.png b/AcuantCamera/AcuantCamera/Media.xcassets/barcode_placement_overlay.imageset/barcode.png similarity index 100% rename from AcuantCamera/AcuantCamera/Camera/Mrz/Media.xcassets/barcode_placement_overlay.imageset/barcode.png rename to AcuantCamera/AcuantCamera/Media.xcassets/barcode_placement_overlay.imageset/barcode.png diff --git a/AcuantCamera/AcuantCamera/View/CameraCornerOverlayView.swift b/AcuantCamera/AcuantCamera/View/CameraCornerOverlayView.swift index 401d894..1dd7358 100644 --- a/AcuantCamera/AcuantCamera/View/CameraCornerOverlayView.swift +++ b/AcuantCamera/AcuantCamera/View/CameraCornerOverlayView.swift @@ -28,6 +28,10 @@ public class CameraCornerOverlayView: CALayer { } } + override init(layer: Any) { + super.init(layer: layer) + } + required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) } diff --git a/AcuantCamera/AcuantCamera/View/CameraTextView.swift b/AcuantCamera/AcuantCamera/View/CameraTextView.swift index 83c29c4..4c18c7d 100644 --- a/AcuantCamera/AcuantCamera/View/CameraTextView.swift +++ b/AcuantCamera/AcuantCamera/View/CameraTextView.swift @@ -11,7 +11,7 @@ import UIKit public class CameraTextView: CATextLayer { public var textSizeDefault: CGFloat = 30 - public var textSizeCapture: CGFloat = 70 + public var textSizeCapture: CGFloat = 50 public var backgroundColorDefault: CGColor? = UIColor.black.cgColor public var backgroundColorCapture: CGColor? public var foregroundColorDefault: CGColor? = UIColor.white.cgColor @@ -19,7 +19,7 @@ public class CameraTextView: CATextLayer { var defaultWidth: CGFloat = 300 var defaultHeight: CGFloat = 40 - var captureWidth: CGFloat = 100 + var captureWidth: CGFloat = 300 var captureHeight: CGFloat = 300 public override var string: Any? { diff --git a/AcuantFaceCapture/AcuantFaceCapture.xcodeproj/project.pbxproj b/AcuantFaceCapture/AcuantFaceCapture.xcodeproj/project.pbxproj index da0bace..43b89d5 100644 --- a/AcuantFaceCapture/AcuantFaceCapture.xcodeproj/project.pbxproj +++ b/AcuantFaceCapture/AcuantFaceCapture.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ D9395F4826C6CF910057EE4D /* AlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9395F4726C6CF910057EE4D /* AlertView.swift */; }; D9395F8026C726510057EE4D /* UIWindowExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9395F7F26C726510057EE4D /* UIWindowExtensions.swift */; }; D9395F8226C7267F0057EE4D /* UIInterfaceOrientationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9395F8126C7267F0057EE4D /* UIInterfaceOrientationExtensions.swift */; }; + D9676E1927600A1C001E8B4C /* FaceCaptureResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9676E1827600A1C001E8B4C /* FaceCaptureResult.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -38,6 +39,7 @@ D9395F4726C6CF910057EE4D /* AlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertView.swift; sourceTree = ""; }; D9395F7F26C726510057EE4D /* UIWindowExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIWindowExtensions.swift; sourceTree = ""; }; D9395F8126C7267F0057EE4D /* UIInterfaceOrientationExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIInterfaceOrientationExtensions.swift; sourceTree = ""; }; + D9676E1827600A1C001E8B4C /* FaceCaptureResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaceCaptureResult.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,15 +82,13 @@ 83F0BF7323D8B28E00140A06 /* AcuantFaceCapture */ = { isa = PBXGroup; children = ( + D9676E1A27600F39001E8B4C /* Models */, D9395F8426C727260057EE4D /* Extension */, D9395F8326C726F60057EE4D /* View */, - 8320597A23DBA18100B7803F /* FaceCameraOptions.swift */, 83F0BFAA23D8B59D00140A06 /* FaceCaptureController.swift */, + 83F0BFB923D8B81200140A06 /* AcuantFaceCaptureSession.swift */, 83F0BF7423D8B28E00140A06 /* AcuantFaceCapture.h */, 83F0BF7523D8B28E00140A06 /* Info.plist */, - 83F0BFB723D8B7E600140A06 /* AcuantFaceState.swift */, - 83F0BFB923D8B81200140A06 /* AcuantFaceCaptureSession.swift */, - 83F0BFBB23D8B87F00140A06 /* AcuantFaceDetails.swift */, ); path = AcuantFaceCapture; sourceTree = ""; @@ -113,6 +113,17 @@ path = Extension; sourceTree = ""; }; + D9676E1A27600F39001E8B4C /* Models */ = { + isa = PBXGroup; + children = ( + 8320597A23DBA18100B7803F /* FaceCameraOptions.swift */, + D9676E1827600A1C001E8B4C /* FaceCaptureResult.swift */, + 83F0BFBB23D8B87F00140A06 /* AcuantFaceDetails.swift */, + 83F0BFB723D8B7E600140A06 /* AcuantFaceState.swift */, + ); + path = Models; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -201,6 +212,7 @@ 83F0BFB823D8B7E600140A06 /* AcuantFaceState.swift in Sources */, 8320597823DBA14100B7803F /* FaceCameraCornerView.swift in Sources */, 83F0BFAB23D8B59D00140A06 /* FaceCaptureController.swift in Sources */, + D9676E1927600A1C001E8B4C /* FaceCaptureResult.swift in Sources */, D9395F8026C726510057EE4D /* UIWindowExtensions.swift in Sources */, 8320597923DBA14100B7803F /* FaceCameraCornerOverlayView.swift in Sources */, D9395F4626C5D1EC0057EE4D /* ImagePlaceholderLayer.swift in Sources */, diff --git a/AcuantFaceCapture/AcuantFaceCapture/FaceCaptureController.swift b/AcuantFaceCapture/AcuantFaceCapture/FaceCaptureController.swift index d86723e..2d93632 100644 --- a/AcuantFaceCapture/AcuantFaceCapture/FaceCaptureController.swift +++ b/AcuantFaceCapture/AcuantFaceCapture/FaceCaptureController.swift @@ -13,7 +13,7 @@ import AcuantImagePreparation public class FaceCaptureController: UIViewController { - public var callback: ((UIImage?)->())? + public var callback: ((FaceCaptureResult?) -> Void)? public var options: FaceCameraOptions? private var overlayView: UIView! @@ -234,23 +234,25 @@ public class FaceCaptureController: UIViewController { } } - private func handleCountdown(image: UIImage){ - if(currentTimer == nil){ + private func handleCountdown(image: UIImage) { + if currentTimer == nil { currentTimer = CFAbsoluteTimeGetCurrent() } let time = self.options!.totalCaptureTime - Int(CFAbsoluteTimeGetCurrent() - (currentTimer ?? CFAbsoluteTimeGetCurrent())) - if(time > 0){ + if time > 0 { self.addMessage(messageKey: "acuant_face_camera_capturing_\(time)", color: self.options!.fontColorGood) - } - else{ - if(!self.isCaptured){ - self.isCaptured = true - self.navigationController?.popViewController(animated: true) - if let userCallback = self.callback { - let resized = ImagePreparation.resize(image: image, targetWidth: getTargetWidth(width: Int(image.size.width), height: Int(image.size.height))) - userCallback(resized) - } + } else if !self.isCaptured { + self.isCaptured = true + self.navigationController?.popViewController(animated: true) + if let resized = ImagePreparation.resize(image: image, + targetWidth: getTargetWidth(width: Int(image.size.width), + height: Int(image.size.height))), + let signedImageData = ImagePreparation.sign(image: resized), + let signedImage = UIImage(data: signedImageData) { + callback?(FaceCaptureResult(image: signedImage, jpegData: signedImageData)) + } else { + callback?(nil) } } } diff --git a/AcuantFaceCapture/AcuantFaceCapture/AcuantFaceDetails.swift b/AcuantFaceCapture/AcuantFaceCapture/Models/AcuantFaceDetails.swift similarity index 100% rename from AcuantFaceCapture/AcuantFaceCapture/AcuantFaceDetails.swift rename to AcuantFaceCapture/AcuantFaceCapture/Models/AcuantFaceDetails.swift diff --git a/AcuantFaceCapture/AcuantFaceCapture/AcuantFaceState.swift b/AcuantFaceCapture/AcuantFaceCapture/Models/AcuantFaceState.swift similarity index 100% rename from AcuantFaceCapture/AcuantFaceCapture/AcuantFaceState.swift rename to AcuantFaceCapture/AcuantFaceCapture/Models/AcuantFaceState.swift diff --git a/AcuantFaceCapture/AcuantFaceCapture/FaceCameraOptions.swift b/AcuantFaceCapture/AcuantFaceCapture/Models/FaceCameraOptions.swift similarity index 100% rename from AcuantFaceCapture/AcuantFaceCapture/FaceCameraOptions.swift rename to AcuantFaceCapture/AcuantFaceCapture/Models/FaceCameraOptions.swift diff --git a/AcuantFaceCapture/AcuantFaceCapture/Models/FaceCaptureResult.swift b/AcuantFaceCapture/AcuantFaceCapture/Models/FaceCaptureResult.swift new file mode 100644 index 0000000..fd1c105 --- /dev/null +++ b/AcuantFaceCapture/AcuantFaceCapture/Models/FaceCaptureResult.swift @@ -0,0 +1,19 @@ +// +// FaceCaptureResult.swift +// AcuantFaceCapture +// +// Created by Federico Nicoli on 7/12/21. +// Copyright © 2021 Acuant. All rights reserved. +// + +import UIKit + +@objcMembers public class FaceCaptureResult: NSObject { + public let image: UIImage + public let jpegData: Data + + init(image: UIImage, jpegData: Data) { + self.image = image + self.jpegData = jpegData + } +} diff --git a/AcuantiOSSDKV11.podspec b/AcuantiOSSDKV11.podspec index 74aee0a..13548ed 100644 --- a/AcuantiOSSDKV11.podspec +++ b/AcuantiOSSDKV11.podspec @@ -1,9 +1,9 @@ Pod::Spec.new do |s| s.platform = :ios - s.swift_versions = ['5.4.2'] + s.swift_versions = ['5.5.2'] s.ios.deployment_target = '11.0' s.name = "AcuantiOSSDKV11" - s.version = "11.5.4" + s.version = "11.5.5" s.summary = "Acuant's latest SDK with most advanced image capture technology and optimized user workflow " s.description = "Acuant's latest SDK with most advanced image capture technology and optimized user workflow. @@ -18,7 +18,7 @@ Pod::Spec.new do |s| Copyright 2021 Acuant, Inc. All Rights Reserved. LICENSE } - s.author = { "Acuant Inc" => "jmoon@acuantcorp.com" } + s.author = { "Acuant Inc" => "smaltsev@acuant.com" } s.source = { :git => "https://github.com/Acuant/iOSSDKV11.git", :tag => "#{s.version}" } s.pod_target_xcconfig = { @@ -77,7 +77,7 @@ Pod::Spec.new do |s| acuantIP.ios.vendored_frameworks = "EmbeddedFrameworks/AcuantIPLiveness.xcframework" acuantIP.dependency "#{s.name}/AcuantCommon" - acuantIP.dependency 'iProov', '~> 8.4.0' + acuantIP.dependency 'iProov', '~> 9.2.0' end s.subspec 'AcuantEchipReader' do |acuantEchip| @@ -94,6 +94,7 @@ Pod::Spec.new do |s| acuantFaceCapture.source_files = "AcuantFaceCapture/AcuantFaceCapture/*.{h,swift}", "AcuantFaceCapture/AcuantFaceCapture/View/*.{h,swift}", + "AcuantFaceCapture/AcuantFaceCapture/Models/*.{h,swift}", "AcuantFaceCapture/AcuantFaceCapture/Extension/*.{h,swift}" acuantFaceCapture.dependency "#{s.name}/AcuantCommon" @@ -117,27 +118,24 @@ Pod::Spec.new do |s| "AcuantCamera/AcuantCamera/Camera/Mrz/OCR/Utils/*.{h,swift}" mrz.dependency "#{s.name}/AcuantCamera/Common" mrz.ios.vendored_frameworks = "EmbeddedFrameworks/TesseractOCR.framework" - mrz.resources = "AcuantCamera/AcuantCamera/Camera/Mrz/*.xcassets" end acuantCamera.subspec 'Barcode' do |barcode| - barcode.source_files = "AcuantCamera/AcuantCamera/Camera/Barcode/*.{h,swift}", - barcode.resources = "AcuantCamera/AcuantCamera/Camera/Mrz/*.xcassets" + barcode.source_files = "AcuantCamera/AcuantCamera/Camera/Barcode/*.{h,swift}" barcode.dependency "#{s.name}/AcuantCamera/Common" end - acuantCamera.subspec 'Common' do |common| - common.source_files = + acuantCamera.subspec 'Common' do |common| + common.source_files = "AcuantCamera/AcuantCamera/View/*.{h,swift}", "AcuantCamera/AcuantCamera/Extension/*.{h,swift}", "AcuantCamera/AcuantCamera/Constant/*.{h,swift}", "AcuantCamera/AcuantCamera/Camera/*.{h,swift}" - end - - acuantCamera.source_files = - "AcuantCamera/AcuantCamera/*.{h,swift}" - - + common.resource_bundles = { 'AcuantCameraAssets' => [ 'AcuantCamera/AcuantCamera/*.xcassets'] } + end + + acuantCamera.source_files = "AcuantCamera/AcuantCamera/*.{h,swift}" + acuantCamera.dependency "#{s.name}/AcuantCommon" acuantCamera.dependency "#{s.name}/AcuantImagePreparation" end diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/Info.plist b/EmbeddedFrameworks/AcuantCommon.xcframework/Info.plist index 956d7ff..6705250 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/Info.plist +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath AcuantCommon.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath AcuantCommon.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/AcuantCommon b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/AcuantCommon index 4cad435..7a78847 100755 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/AcuantCommon and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/AcuantCommon differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Headers/AcuantCommon-Swift.h b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Headers/AcuantCommon-Swift.h index 98ecd3c..4b0f3d2 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Headers/AcuantCommon-Swift.h +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Headers/AcuantCommon-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTCOMMON_SWIFT_H #define ACUANTCOMMON_SWIFT_H #pragma clang diagnostic push @@ -386,6 +386,7 @@ SWIFT_CLASS("_TtC12AcuantCommon9Endpoints") @property (nonatomic, copy) NSString * _Nullable frmEndpoint; @property (nonatomic, copy) NSString * _Nullable idEndpoint; @property (nonatomic, copy) NSString * _Nullable passiveLivenessEndpoint; +@property (nonatomic, copy) NSString * _Nullable ipLivenessEndpoint; @property (nonatomic, copy) NSString * _Nullable healthInsuranceEndpoint; @property (nonatomic, copy) NSString * _Nullable acasEndpoint; @property (nonatomic, copy) NSString * _Nullable ozoneEndpoint; diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Info.plist b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Info.plist index 8f02b98..db84f4f 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Info.plist and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftdoc index 164eb9d..64fd511 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftinterface index 348773e..b13c6b7 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc index 164eb9d..64fd511 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface index 348773e..b13c6b7 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/AcuantCommon b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/AcuantCommon index 4be3953..77904b6 100755 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/AcuantCommon and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/AcuantCommon differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Headers/AcuantCommon-Swift.h b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Headers/AcuantCommon-Swift.h index 3d4b591..bcdf167 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Headers/AcuantCommon-Swift.h +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Headers/AcuantCommon-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTCOMMON_SWIFT_H #define ACUANTCOMMON_SWIFT_H #pragma clang diagnostic push @@ -388,6 +388,7 @@ SWIFT_CLASS("_TtC12AcuantCommon9Endpoints") @property (nonatomic, copy) NSString * _Nullable frmEndpoint; @property (nonatomic, copy) NSString * _Nullable idEndpoint; @property (nonatomic, copy) NSString * _Nullable passiveLivenessEndpoint; +@property (nonatomic, copy) NSString * _Nullable ipLivenessEndpoint; @property (nonatomic, copy) NSString * _Nullable healthInsuranceEndpoint; @property (nonatomic, copy) NSString * _Nullable acasEndpoint; @property (nonatomic, copy) NSString * _Nullable ozoneEndpoint; @@ -447,7 +448,7 @@ SWIFT_CLASS_PROPERTY(@property (nonatomic, class, copy) NSString * _Nonnull SDK_ #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTCOMMON_SWIFT_H #define ACUANTCOMMON_SWIFT_H #pragma clang diagnostic push @@ -835,6 +836,7 @@ SWIFT_CLASS("_TtC12AcuantCommon9Endpoints") @property (nonatomic, copy) NSString * _Nullable frmEndpoint; @property (nonatomic, copy) NSString * _Nullable idEndpoint; @property (nonatomic, copy) NSString * _Nullable passiveLivenessEndpoint; +@property (nonatomic, copy) NSString * _Nullable ipLivenessEndpoint; @property (nonatomic, copy) NSString * _Nullable healthInsuranceEndpoint; @property (nonatomic, copy) NSString * _Nullable acasEndpoint; @property (nonatomic, copy) NSString * _Nullable ozoneEndpoint; diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Info.plist b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Info.plist index 4d26cbf..5fde125 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Info.plist and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftdoc index de2ee4d..a58e5c2 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface index a8b7e5f..b5253ba 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc index de2ee4d..a58e5c2 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface index a8b7e5f..b5253ba 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index d1caec8..54244f2 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 007b83b..0d786a8 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc index d1caec8..54244f2 100644 Binary files a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface index 007b83b..0d786a8 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantCommon import Foundation import MobileCoreServices import Swift import UIKit +import _Concurrency public protocol IAcuantInitializer { func initialize(packages: [AcuantCommon.IAcuantPackage], callback: @escaping (AcuantCommon.AcuantError?) -> ()) -> Foundation.URLSessionTask? } @@ -26,6 +27,9 @@ public class AcuantInitializer : AcuantCommon.IAcuantInitializer { public var hasLiveCapture: Swift.Bool { get } + public var ipLiveness: Swift.Bool { + get + } @objc deinit } @objc public enum DeleteType : Swift.Int { @@ -178,6 +182,7 @@ public protocol IAcuantPackage { @objc public var frmEndpoint: Swift.String? @objc public var idEndpoint: Swift.String? @objc public var passiveLivenessEndpoint: Swift.String? + @objc public var ipLivenessEndpoint: Swift.String? @objc public var healthInsuranceEndpoint: Swift.String? @objc public var acasEndpoint: Swift.String? @objc public var ozoneEndpoint: Swift.String? diff --git a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/_CodeSignature/CodeResources index ce28289..d8f8412 100644 --- a/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantCommon.xcframework/ios-arm64_x86_64-simulator/AcuantCommon.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantCommon-Swift.h - s71c1MU6CZTUXP1nv6symbxmNMg= + MwXM7VAQR/NvLvozRPvJ704295k= Headers/AcuantCommons.h @@ -14,55 +14,55 @@ Info.plist - cf6D7C+TNZjSGBYU+FiPd4yoikQ= + dPAwfX6JUC8tz6KTK3gHrQ0QxC8= Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftdoc - 1tuT0fxpyl5fVYkGkis9/lf/oRo= + +LOs7IuMLd8cAokA6nxJ7InT2Xc= Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface - yq85ZVyYu1CIZVLu5JlwscG4VIc= + uXScB81KBK+BeTEGoZ3vGR2RmEk= Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftmodule - 4vHKaYDUmeZaL3owDm0DMPk092c= + 6q97S7N74gvcIVtV4960JEn2xfU= Modules/AcuantCommon.swiftmodule/arm64.swiftdoc - 1tuT0fxpyl5fVYkGkis9/lf/oRo= + +LOs7IuMLd8cAokA6nxJ7InT2Xc= Modules/AcuantCommon.swiftmodule/arm64.swiftinterface - yq85ZVyYu1CIZVLu5JlwscG4VIc= + uXScB81KBK+BeTEGoZ3vGR2RmEk= Modules/AcuantCommon.swiftmodule/arm64.swiftmodule - 4vHKaYDUmeZaL3owDm0DMPk092c= + 6q97S7N74gvcIVtV4960JEn2xfU= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - YRj9zQ5fF/ckjA+c7QNlLJ/QiFg= + VID0AOl1mfAIXuYVCmWW4fI+SFc= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - I6E7xk0cBpVX1K5R2Ms3d+O3TVY= + knlRArcp1+HO3NdEksAQPygoDOM= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - r0QsFYowzMxV+TIKOUkKF/ZZJBs= + vc1r2VtI5IBJ9a97O2x0uFkXp/4= Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc - YRj9zQ5fF/ckjA+c7QNlLJ/QiFg= + VID0AOl1mfAIXuYVCmWW4fI+SFc= Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface - I6E7xk0cBpVX1K5R2Ms3d+O3TVY= + knlRArcp1+HO3NdEksAQPygoDOM= Modules/AcuantCommon.swiftmodule/x86_64.swiftmodule - r0QsFYowzMxV+TIKOUkKF/ZZJBs= + vc1r2VtI5IBJ9a97O2x0uFkXp/4= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - NNw/EMVNpwWRs6nEaU+yLjc9VNSeg/SCGaJPlJnoE4U= + gE73NajqbXBDkUbPAeB18nmWT60JsGuDAOMzbFVacow= Headers/AcuantCommons.h @@ -89,84 +89,84 @@ hash2 - pq1j4jwIFgbRR+wmcVFF/BIgmI1ZtRO9JRskL05j0hg= + e7nZdRgGX9jJFGRuJwkRL+tVTq9Wi4AuRkRVoH9iWfM= Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - JeKgr424cUj23MPGSWIuWvXlZ9CwaMzvSU+lfeDJRRM= + VeSkEKPx2MvlGgT3/TfwfL4nDByaS00ap6WXijF2WN4= Modules/AcuantCommon.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - /vvhuVYGp3MY3Ak9RW/m5gbP18kTB1q242XtrNv1tII= + m4AjCsVYj1jtuslTjLGbkg17Of10ACuh3xcIo+KfiuA= Modules/AcuantCommon.swiftmodule/arm64.swiftdoc hash2 - pq1j4jwIFgbRR+wmcVFF/BIgmI1ZtRO9JRskL05j0hg= + e7nZdRgGX9jJFGRuJwkRL+tVTq9Wi4AuRkRVoH9iWfM= Modules/AcuantCommon.swiftmodule/arm64.swiftinterface hash2 - JeKgr424cUj23MPGSWIuWvXlZ9CwaMzvSU+lfeDJRRM= + VeSkEKPx2MvlGgT3/TfwfL4nDByaS00ap6WXijF2WN4= Modules/AcuantCommon.swiftmodule/arm64.swiftmodule hash2 - /vvhuVYGp3MY3Ak9RW/m5gbP18kTB1q242XtrNv1tII= + m4AjCsVYj1jtuslTjLGbkg17Of10ACuh3xcIo+KfiuA= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - i+Ix3+1fDJN1Mj0xg4q/zMsHrLn61oLstKeR3HBAmhw= + bMRQFLIG171dq6A2+r1pJl4z+QJq6rOdMdowf3Gp1+E= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - cVIHk+e0VAvl+mZhVJRB4bTc0d2GWASWiFxJQxFcvLw= + +GEk8OxmY00TlUu6KHLZrSLJ7OfP2FAOR32ONAmqNKg= Modules/AcuantCommon.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - sMxscL0fXuJMQKnAONb6IS0AMjcJ+axRlBWnMsWQflU= + 9iq0F5NtL68AnLrxOctAkoZ5I8SlrZbIsU+Stya7uyE= Modules/AcuantCommon.swiftmodule/x86_64.swiftdoc hash2 - i+Ix3+1fDJN1Mj0xg4q/zMsHrLn61oLstKeR3HBAmhw= + bMRQFLIG171dq6A2+r1pJl4z+QJq6rOdMdowf3Gp1+E= Modules/AcuantCommon.swiftmodule/x86_64.swiftinterface hash2 - cVIHk+e0VAvl+mZhVJRB4bTc0d2GWASWiFxJQxFcvLw= + +GEk8OxmY00TlUu6KHLZrSLJ7OfP2FAOR32ONAmqNKg= Modules/AcuantCommon.swiftmodule/x86_64.swiftmodule hash2 - sMxscL0fXuJMQKnAONb6IS0AMjcJ+axRlBWnMsWQflU= + 9iq0F5NtL68AnLrxOctAkoZ5I8SlrZbIsU+Stya7uyE= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/AcuantDocumentProcessing b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/AcuantDocumentProcessing index 9b38a50..41fbb1e 100755 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/AcuantDocumentProcessing and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/AcuantDocumentProcessing differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h index 9a06a8f..78adebf 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTDOCUMENTPROCESSING_SWIFT_H #define ACUANTDOCUMENTPROCESSING_SWIFT_H #pragma clang diagnostic push @@ -525,6 +525,7 @@ SWIFT_CLASS("_TtC24AcuantDocumentProcessing9IdOptions") @property (nonatomic) BOOL isRetrying; @property (nonatomic) enum AuthenticationSensitivity authenticationSensitivity; @property (nonatomic) enum TamperSensitivity tamperSensitivity; +@property (nonatomic, copy) NSString * _Nullable countryCode; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; + (IdOptions * _Nonnull)createInstance SWIFT_WARN_UNUSED_RESULT; @end diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Info.plist b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Info.plist index 22e303f..57de8bf 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Info.plist and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftdoc index 17e0a5b..aa61dca 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftinterface index 33bbb70..7a97de2 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc index 17e0a5b..aa61dca 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface index 33bbb70..7a97de2 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/AcuantDocumentProcessing b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/AcuantDocumentProcessing index c836f84..a3f3b21 100755 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/AcuantDocumentProcessing and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/AcuantDocumentProcessing differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h index 3cd4b3b..7f74da1 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Headers/AcuantDocumentProcessing-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTDOCUMENTPROCESSING_SWIFT_H #define ACUANTDOCUMENTPROCESSING_SWIFT_H #pragma clang diagnostic push @@ -527,6 +527,7 @@ SWIFT_CLASS("_TtC24AcuantDocumentProcessing9IdOptions") @property (nonatomic) BOOL isRetrying; @property (nonatomic) enum AuthenticationSensitivity authenticationSensitivity; @property (nonatomic) enum TamperSensitivity tamperSensitivity; +@property (nonatomic, copy) NSString * _Nullable countryCode; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; + (IdOptions * _Nonnull)createInstance SWIFT_WARN_UNUSED_RESULT; @end @@ -639,7 +640,7 @@ SWIFT_PROTOCOL("_TtP24AcuantDocumentProcessing19UploadImageDelegate_") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTDOCUMENTPROCESSING_SWIFT_H #define ACUANTDOCUMENTPROCESSING_SWIFT_H #pragma clang diagnostic push @@ -1166,6 +1167,7 @@ SWIFT_CLASS("_TtC24AcuantDocumentProcessing9IdOptions") @property (nonatomic) BOOL isRetrying; @property (nonatomic) enum AuthenticationSensitivity authenticationSensitivity; @property (nonatomic) enum TamperSensitivity tamperSensitivity; +@property (nonatomic, copy) NSString * _Nullable countryCode; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; + (IdOptions * _Nonnull)createInstance SWIFT_WARN_UNUSED_RESULT; @end diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Info.plist b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Info.plist index 95a80d1..d91c3db 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Info.plist and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftdoc index ac17c94..10de4f2 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface index d36fcee..36de3c0 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc index ac17c94..10de4f2 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface index d36fcee..36de3c0 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index afbbaa4..90c9f07 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 00aed15..78bc4d8 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc index afbbaa4..90c9f07 100644 Binary files a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface index 00aed15..78bc4d8 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantDocumentProcessing import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class IdData : ObjectiveC.NSObject { @objc public var image: UIKit.UIImage? @objc public var barcodeString: Swift.String? @@ -208,6 +209,7 @@ public class EvaluatedImageData { @objc public var isRetrying: Swift.Bool @objc public var authenticationSensitivity: AcuantDocumentProcessing.IdOptions.AuthenticationSensitivity @objc public var tamperSensitivity: AcuantDocumentProcessing.IdOptions.TamperSensitivity + @objc public var countryCode: Swift.String? @objc override dynamic public init() @objc public class func createInstance() -> AcuantDocumentProcessing.IdOptions @objc deinit diff --git a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/_CodeSignature/CodeResources index 4b59bd5..19a3e47 100644 --- a/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantDocumentProcessing.xcframework/ios-arm64_x86_64-simulator/AcuantDocumentProcessing.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantDocumentProcessing-Swift.h - kfYMQZlqZaZpeNVDrVq94ECZo38= + G2SjOpXhnZvCyMQwpM7G6HM4vqU= Headers/AssureIDSDK.h @@ -14,55 +14,55 @@ Info.plist - qx4QbH7SKvD0a8beBclDUehdJxU= + 2brDV/0sAK6PngzwvWb87eDoG8g= Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftdoc - HH0OYcV3O8mmzA8x7q57lnEUSSY= + q49CYsqm+zcQXnhSYIcEH6JAcks= Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface - 6fQWrLq7Q/GjdkhflmKU9HEh8/M= + JZie3v9Xwp8Le+kei2JCYcZ/hP8= Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftmodule - /gm0SQUfuI7k+qTKXBJraz+OwgI= + XfGEP7xhg0++0UVD7F9m9kNdpgg= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc - HH0OYcV3O8mmzA8x7q57lnEUSSY= + q49CYsqm+zcQXnhSYIcEH6JAcks= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface - 6fQWrLq7Q/GjdkhflmKU9HEh8/M= + JZie3v9Xwp8Le+kei2JCYcZ/hP8= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftmodule - /gm0SQUfuI7k+qTKXBJraz+OwgI= + XfGEP7xhg0++0UVD7F9m9kNdpgg= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - V7rDNp61rWnGXG36nHZH44+zwyg= + XpHKKa7b7Pl86XRMgYGNs802SbM= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - dXRqinXtlvgnZZaWP67R+kHAkIw= + o+XfuGSU7RiXMdZGWOboM0YrnBc= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - 8UdgyMM/7pfJXq+3wMUPgfJGDkw= + rnDbn94GwOOQJIUSmEg1idkrfMQ= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc - V7rDNp61rWnGXG36nHZH44+zwyg= + XpHKKa7b7Pl86XRMgYGNs802SbM= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface - dXRqinXtlvgnZZaWP67R+kHAkIw= + o+XfuGSU7RiXMdZGWOboM0YrnBc= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftmodule - 8UdgyMM/7pfJXq+3wMUPgfJGDkw= + rnDbn94GwOOQJIUSmEg1idkrfMQ= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - jIBlkiz7rhnwMRDg0HqtJHAkc6vDBbRgIv6A5O0hq0Y= + II8cU5VclbtJYrzChtLJTPdYJtdhwEmjhCU21Lzc0mY= Headers/AssureIDSDK.h @@ -89,84 +89,84 @@ hash2 - 4jfUYvzr+oc7khDHrU+8EkJqb9P5vUIuKIWBYnpMlsA= + fZNUc7QCckM/63ICpHc61L9Z0peyKuMlQcYpSy7t3KE= Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - M8bMyYz7xeLLlR8kFBiN9mh2J6Mm5t8jLkq2izrCfeY= + Gwic8kTa2GIej70WVdCxoaLbks1VGSjFjUSPnIthW6I= Modules/AcuantDocumentProcessing.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - q2rn3z7IUAzEdccxaXLaABrEIsI8tF96jpyJsJnk9JQ= + OesWcV/MYRoENMJ3FMlB99xwdb9d0C9tu49Z6cJmSNQ= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftdoc hash2 - 4jfUYvzr+oc7khDHrU+8EkJqb9P5vUIuKIWBYnpMlsA= + fZNUc7QCckM/63ICpHc61L9Z0peyKuMlQcYpSy7t3KE= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftinterface hash2 - M8bMyYz7xeLLlR8kFBiN9mh2J6Mm5t8jLkq2izrCfeY= + Gwic8kTa2GIej70WVdCxoaLbks1VGSjFjUSPnIthW6I= Modules/AcuantDocumentProcessing.swiftmodule/arm64.swiftmodule hash2 - q2rn3z7IUAzEdccxaXLaABrEIsI8tF96jpyJsJnk9JQ= + OesWcV/MYRoENMJ3FMlB99xwdb9d0C9tu49Z6cJmSNQ= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - E1/nY/k5Eq2Uz2yRwsA6SZBcsFACANrpVJN+W7be3yg= + Kz6JDduSsz/UN1egqYZjPwefr1xvqkUVrj2MMe2ei80= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - 4UpwRwwmjyaPy3ViQQUMMB2EdtusI5vYKoWahCsm2ao= + PDE0Kt2JaCxJGs3j38iAt0k7ABqF3GKDtlvNK0AXbfs= Modules/AcuantDocumentProcessing.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - 9GLtK5RcO1cLncZAnML+ZntA+MzZVsaxcknPFXFRhks= + nERMh+qejoVQEZhbCG596r/NTxFUcATmduV5jbGFYV4= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftdoc hash2 - E1/nY/k5Eq2Uz2yRwsA6SZBcsFACANrpVJN+W7be3yg= + Kz6JDduSsz/UN1egqYZjPwefr1xvqkUVrj2MMe2ei80= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftinterface hash2 - 4UpwRwwmjyaPy3ViQQUMMB2EdtusI5vYKoWahCsm2ao= + PDE0Kt2JaCxJGs3j38iAt0k7ABqF3GKDtlvNK0AXbfs= Modules/AcuantDocumentProcessing.swiftmodule/x86_64.swiftmodule hash2 - 9GLtK5RcO1cLncZAnML+ZntA+MzZVsaxcknPFXFRhks= + nERMh+qejoVQEZhbCG596r/NTxFUcATmduV5jbGFYV4= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/AcuantEchipReader b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/AcuantEchipReader index 60a451b..f90550d 100755 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/AcuantEchipReader and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/AcuantEchipReader differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h index 93c2247..2f6ee9e 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTECHIPREADER_SWIFT_H #define ACUANTECHIPREADER_SWIFT_H #pragma clang diagnostic push diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Info.plist b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Info.plist index 4c28b03..fa78a37 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Info.plist and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftdoc index 8f482db..4fa98c6 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftinterface index bf7ad09..3922464 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc index 8f482db..4fa98c6 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface index bf7ad09..3922464 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/AcuantEchipReader b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/AcuantEchipReader index ca70352..2b3827b 100755 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/AcuantEchipReader and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/AcuantEchipReader differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h index 684e0d8..81f87e8 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Headers/AcuantEchipReader-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTECHIPREADER_SWIFT_H #define ACUANTECHIPREADER_SWIFT_H #pragma clang diagnostic push @@ -223,7 +223,7 @@ SWIFT_CLASS("_TtC17AcuantEchipReader12OzoneService") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTECHIPREADER_SWIFT_H #define ACUANTECHIPREADER_SWIFT_H #pragma clang diagnostic push diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Info.plist b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Info.plist index fea65a9..ba6750c 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Info.plist and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 9efbd7a..fb68cd9 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 1da7f78..89c2eaa 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc index 9efbd7a..fb68cd9 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface index 1da7f78..89c2eaa 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 091aebf..71c935c 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 5dddb53..fe1d013 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc index 091aebf..71c935c 100644 Binary files a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface index 5dddb53..fe1d013 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface @@ -1,5 +1,5 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantEchipReader import AcuantCommon @_exported import AcuantEchipReader @@ -13,6 +13,7 @@ import Security import Swift import SwiftUI import UIKit +import _Concurrency @available(iOS 13, *) public enum DocTypeEnum : Swift.String { case TD1 @@ -47,7 +48,6 @@ public protocol IOzoneService { public init(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) public class func createInstance(request: AcuantEchipReader.OzoneRequest, delegate: @escaping ((AcuantEchipReader.OzoneResponse?, AcuantCommon.AcuantError?) -> ())) -> AcuantEchipReader.OzoneService public func getTask() -> Foundation.URLSessionTask? - @objc override dynamic public init() @objc deinit } public enum AcuantDataGroupId : Swift.Int { diff --git a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/_CodeSignature/CodeResources index 3193ce3..67c43a7 100644 --- a/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantEchipReader.xcframework/ios-arm64_x86_64-simulator/AcuantEchipReader.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantEchipReader-Swift.h - 2WvpFqx3njDAhJOXCv0HAxtr1sI= + H5P+RdMb6G4a4dZy/aMqx40Pnjs= Headers/AcuantEchipReader.h @@ -14,55 +14,55 @@ Info.plist - EC1kI5Hh0mObnD/T/OMQSq5yrEs= + ZrRX95oWEek939hbrBYHFrfvofM= Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftdoc - nQEtyDngnLyx71JPxa3kdB3Vr2k= + BanxTxxX4dDBnMff+Z21zuTPDAI= Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface - X2S7sqT/QVTzl56tS8b7ES6XdTA= + 8sbG6tGL+Yoy47msLTU6fpNkA3Y= Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftmodule - CFsz8yY1wo6XUhNPlYIRBU8a3j4= + Dfl2BClYfmHyNDkOwKicfcZZs8c= Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc - nQEtyDngnLyx71JPxa3kdB3Vr2k= + BanxTxxX4dDBnMff+Z21zuTPDAI= Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface - X2S7sqT/QVTzl56tS8b7ES6XdTA= + 8sbG6tGL+Yoy47msLTU6fpNkA3Y= Modules/AcuantEchipReader.swiftmodule/arm64.swiftmodule - CFsz8yY1wo6XUhNPlYIRBU8a3j4= + Dfl2BClYfmHyNDkOwKicfcZZs8c= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - iujYhcWInX5tqRcudMp5YsNiEzE= + 1h6Y/7eE/hq5aUsI6WHS1RmjHAo= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - 150oN+IcCynJiGkZYmO6KHWCFvE= + harhUtp5ufwl7kAZvWuEFWc4yjk= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - 6jdUVkX38Pq6YlxpGUH+NwU+3QM= + Mk0sFPzeKX5QBOwyaVdBN/C4n58= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc - iujYhcWInX5tqRcudMp5YsNiEzE= + 1h6Y/7eE/hq5aUsI6WHS1RmjHAo= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface - 150oN+IcCynJiGkZYmO6KHWCFvE= + harhUtp5ufwl7kAZvWuEFWc4yjk= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftmodule - 6jdUVkX38Pq6YlxpGUH+NwU+3QM= + Mk0sFPzeKX5QBOwyaVdBN/C4n58= Modules/module.modulemap @@ -79,7 +79,7 @@ hash2 - kCNsyAVK8vzYE2a8jEJ99/ThX+AEO/ZAr7zHXX8kOM8= + +ofAI2rxXvVd1PCx1AAlIEDa8Zu0GTwmxPSo7WV6Sg0= Headers/AcuantEchipReader.h @@ -93,84 +93,84 @@ hash2 - 4QkTbmnScn1K3DG76sTkFphb+m39zeZxy1pJ5VA6XGM= + zL2zOPIL38GeALJXq/3GV2MqMGb+JZ1n3sfoto3HtxM= Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - DpDVp8syBLLsussyQoHYQk1FMcBA3ca1ZM3Uj3xo86g= + /8eLFt/65Li6GsczoZSh5pyh7ynqoaS7Jj3QSvjbUGI= Modules/AcuantEchipReader.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - iVihBKCOGoDJqJaDSI0C6aOckxfscK7zBpQLgrbLOu8= + XvBJ7cK56oGSrFb7u2RA6VKvDu/acfAvz75akmaqKrw= Modules/AcuantEchipReader.swiftmodule/arm64.swiftdoc hash2 - 4QkTbmnScn1K3DG76sTkFphb+m39zeZxy1pJ5VA6XGM= + zL2zOPIL38GeALJXq/3GV2MqMGb+JZ1n3sfoto3HtxM= Modules/AcuantEchipReader.swiftmodule/arm64.swiftinterface hash2 - DpDVp8syBLLsussyQoHYQk1FMcBA3ca1ZM3Uj3xo86g= + /8eLFt/65Li6GsczoZSh5pyh7ynqoaS7Jj3QSvjbUGI= Modules/AcuantEchipReader.swiftmodule/arm64.swiftmodule hash2 - iVihBKCOGoDJqJaDSI0C6aOckxfscK7zBpQLgrbLOu8= + XvBJ7cK56oGSrFb7u2RA6VKvDu/acfAvz75akmaqKrw= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - 3x2GkxAzbfU1HBVB71ktjFmvS80VpaClCEavw0wnv5Q= + 2k+gzT3Oxvu22MDR91B2YgvZBbrCoJc4nD7yEbRuBfs= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - C9UEWTaUtU6HqobXa9vctE50lk3tuxZP0/7i7Gh1l5o= + U4IysRF29aIofNUV/HGAdWbz+Dmg+lj1tN12ckIifAk= Modules/AcuantEchipReader.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - H9TgGlRrat6V48IpMJqyZrKXYkqgU27tQJe5QfpvvFQ= + 1IH9pdihSVnI9H0xD7nTPKJcaj77bhNTeWoDL7HDPFY= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftdoc hash2 - 3x2GkxAzbfU1HBVB71ktjFmvS80VpaClCEavw0wnv5Q= + 2k+gzT3Oxvu22MDR91B2YgvZBbrCoJc4nD7yEbRuBfs= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftinterface hash2 - C9UEWTaUtU6HqobXa9vctE50lk3tuxZP0/7i7Gh1l5o= + U4IysRF29aIofNUV/HGAdWbz+Dmg+lj1tN12ckIifAk= Modules/AcuantEchipReader.swiftmodule/x86_64.swiftmodule hash2 - H9TgGlRrat6V48IpMJqyZrKXYkqgU27tQJe5QfpvvFQ= + 1IH9pdihSVnI9H0xD7nTPKJcaj77bhNTeWoDL7HDPFY= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/Info.plist b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/Info.plist index 2912514..08843c1 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/Info.plist +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath AcuantFaceMatch.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath AcuantFaceMatch.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/AcuantFaceMatch b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/AcuantFaceMatch index 64a0cfe..0b5d870 100755 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/AcuantFaceMatch and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/AcuantFaceMatch differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h index a9d8336..ce7a8aa 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTFACEMATCH_SWIFT_H #define ACUANTFACEMATCH_SWIFT_H #pragma clang diagnostic push @@ -216,14 +216,14 @@ SWIFT_CLASS("_TtC15AcuantFaceMatch9FaceMatch") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class NSData; SWIFT_CLASS("_TtC15AcuantFaceMatch15FacialMatchData") @interface FacialMatchData : NSObject -@property (nonatomic, strong) UIImage * _Nonnull faceImageOne; -@property (nonatomic, strong) UIImage * _Nonnull faceImageTwo; -- (nonnull instancetype)initWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo OBJC_DESIGNATED_INITIALIZER; -+ (FacialMatchData * _Nonnull)newInstanceWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo SWIFT_WARN_UNUSED_RESULT; +@property (nonatomic, copy) NSData * _Nonnull faceOneData; +@property (nonatomic, copy) NSData * _Nonnull faceTwoData; +- (nonnull instancetype)initWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData OBJC_DESIGNATED_INITIALIZER; ++ (FacialMatchData * _Nonnull)newInstanceWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Info.plist b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Info.plist index 5c723af..5191170 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Info.plist and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftdoc index feefeb4..428ea0e 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftinterface index c1789e2..2bd63b7 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc index feefeb4..428ea0e 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface index c1789e2..2bd63b7 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/AcuantFaceMatch b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/AcuantFaceMatch index d4abd0b..ef4f41e 100755 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/AcuantFaceMatch and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/AcuantFaceMatch differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h index 8fcc3cc..117432b 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Headers/AcuantFaceMatch-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTFACEMATCH_SWIFT_H #define ACUANTFACEMATCH_SWIFT_H #pragma clang diagnostic push @@ -218,14 +218,14 @@ SWIFT_CLASS("_TtC15AcuantFaceMatch9FaceMatch") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class NSData; SWIFT_CLASS("_TtC15AcuantFaceMatch15FacialMatchData") @interface FacialMatchData : NSObject -@property (nonatomic, strong) UIImage * _Nonnull faceImageOne; -@property (nonatomic, strong) UIImage * _Nonnull faceImageTwo; -- (nonnull instancetype)initWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo OBJC_DESIGNATED_INITIALIZER; -+ (FacialMatchData * _Nonnull)newInstanceWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo SWIFT_WARN_UNUSED_RESULT; +@property (nonatomic, copy) NSData * _Nonnull faceOneData; +@property (nonatomic, copy) NSData * _Nonnull faceTwoData; +- (nonnull instancetype)initWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData OBJC_DESIGNATED_INITIALIZER; ++ (FacialMatchData * _Nonnull)newInstanceWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -259,7 +259,7 @@ SWIFT_CLASS("_TtC15AcuantFaceMatch17FacialMatchResult") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTFACEMATCH_SWIFT_H #define ACUANTFACEMATCH_SWIFT_H #pragma clang diagnostic push @@ -477,14 +477,14 @@ SWIFT_CLASS("_TtC15AcuantFaceMatch9FaceMatch") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class NSData; SWIFT_CLASS("_TtC15AcuantFaceMatch15FacialMatchData") @interface FacialMatchData : NSObject -@property (nonatomic, strong) UIImage * _Nonnull faceImageOne; -@property (nonatomic, strong) UIImage * _Nonnull faceImageTwo; -- (nonnull instancetype)initWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo OBJC_DESIGNATED_INITIALIZER; -+ (FacialMatchData * _Nonnull)newInstanceWithFaceImageOne:(UIImage * _Nonnull)faceImageOne faceImageTwo:(UIImage * _Nonnull)faceImageTwo SWIFT_WARN_UNUSED_RESULT; +@property (nonatomic, copy) NSData * _Nonnull faceOneData; +@property (nonatomic, copy) NSData * _Nonnull faceTwoData; +- (nonnull instancetype)initWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData OBJC_DESIGNATED_INITIALIZER; ++ (FacialMatchData * _Nonnull)newInstanceWithFaceOneData:(NSData * _Nonnull)faceOneData faceTwoData:(NSData * _Nonnull)faceTwoData SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Info.plist b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Info.plist index 3fc894e..2d567c6 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Info.plist and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftdoc index f7fc423..be5c547 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 1bb51b5..da3a0e5 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc index f7fc423..be5c547 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface index 1bb51b5..da3a0e5 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index ce59bd4..0696d12 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 3e2e69d..8bda160 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc index ce59bd4..0696d12 100644 Binary files a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface index 3e2e69d..8bda160 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantFaceMatch import AcuantCommon @_exported import AcuantFaceMatch import Foundation import Swift import UIKit +import _Concurrency @objc public protocol FacialMatchDelegate { @objc func facialMatchFinished(result: AcuantFaceMatch.FacialMatchResult?) } @@ -25,10 +26,9 @@ import UIKit @objc deinit } @objc @objcMembers public class FacialMatchData : ObjectiveC.NSObject { - @objc public var faceImageOne: UIKit.UIImage - @objc public var faceImageTwo: UIKit.UIImage - @objc public init(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) - @objc public class func newInstance(faceImageOne: UIKit.UIImage, faceImageTwo: UIKit.UIImage) -> AcuantFaceMatch.FacialMatchData - @objc override dynamic public init() + @objc public var faceOneData: Foundation.Data + @objc public var faceTwoData: Foundation.Data + @objc public init(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) + @objc public class func newInstance(faceOneData: Foundation.Data, faceTwoData: Foundation.Data) -> AcuantFaceMatch.FacialMatchData @objc deinit } diff --git a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/_CodeSignature/CodeResources index 75d11b3..b6f1666 100644 --- a/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantFaceMatch.xcframework/ios-arm64_x86_64-simulator/AcuantFaceMatch.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantFaceMatch-Swift.h - ADTEWo2pJAKJcBEIgA889dsEeZg= + /1gUpLYRsVGlFLhRZVx92BjGkD0= Headers/AcuantFaceMatch.h @@ -14,55 +14,55 @@ Info.plist - LKKO+bWkJQKQdXz+r8wfWnQAxxg= + uKzumd5J41nC08qPkUY5oKrpLA8= Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftdoc - LLw0dGCttrzdKrjmjZGscbtpu9M= + VLwpYwXMNKB8Uxdk2WZobFue0Q0= Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface - DZl/LfNrLLRMnCMoMaCSKy5HOYU= + 6f7zTJ0dqiWKxQKo1Y5FVWhPn6I= Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftmodule - NVb5Jm9aHAEw3T4WvfsXQsru58I= + 0qj1+K28YYS4MgV9AoFoqDo5tpw= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc - LLw0dGCttrzdKrjmjZGscbtpu9M= + VLwpYwXMNKB8Uxdk2WZobFue0Q0= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface - DZl/LfNrLLRMnCMoMaCSKy5HOYU= + 6f7zTJ0dqiWKxQKo1Y5FVWhPn6I= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftmodule - NVb5Jm9aHAEw3T4WvfsXQsru58I= + 0qj1+K28YYS4MgV9AoFoqDo5tpw= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - ptmFg7nsZJi6EFwSeWApvPW6gS0= + xqZwSlaq87EtvZptCmyYBL56Rl4= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - xn0Fj1iuMbq7SCCJAdzhnY+iSNU= + u75lcxoCVM1tVZWEHuTnz+Pw/vE= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - XpbbYb0arBy+gojdl1PoM285QFo= + BtqU5xLqgeDYbFbrXFC5Bodkw3Y= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc - ptmFg7nsZJi6EFwSeWApvPW6gS0= + xqZwSlaq87EtvZptCmyYBL56Rl4= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface - xn0Fj1iuMbq7SCCJAdzhnY+iSNU= + u75lcxoCVM1tVZWEHuTnz+Pw/vE= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftmodule - XpbbYb0arBy+gojdl1PoM285QFo= + BtqU5xLqgeDYbFbrXFC5Bodkw3Y= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - Jmjfyu4/EuHLShcgCuSw3jzGqyR+paeR0Kgfeg/1zrY= + Fzp9Q6u9FjytawtA/VcOxVnaMq6/kJsb4iyl39zc3s4= Headers/AcuantFaceMatch.h @@ -89,84 +89,84 @@ hash2 - y1UmfpMm/AU1XGTRElub6n0JPx8x/pjUYhqAz3DlvkQ= + /K9Ga7fUdE0sdK7AaNAsP8CB55iBWLGOT1ValksR7/A= Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - G+UOj7pGZ3zu+Zg/KII01jHt0a8fEjIQAZ2ochwd16c= + MRCcHOBEibixWnyWYfYah1mvB7Dq5oDLxApNevxKXc8= Modules/AcuantFaceMatch.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - A7ez2Y8gtEj2BngO4J/eKG74xkGn/fMkSMQpyGgaAow= + S1aWKW6yPQGRvxbUCMLObeeUCs8GMWMbbLouSn6g/Zw= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftdoc hash2 - y1UmfpMm/AU1XGTRElub6n0JPx8x/pjUYhqAz3DlvkQ= + /K9Ga7fUdE0sdK7AaNAsP8CB55iBWLGOT1ValksR7/A= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftinterface hash2 - G+UOj7pGZ3zu+Zg/KII01jHt0a8fEjIQAZ2ochwd16c= + MRCcHOBEibixWnyWYfYah1mvB7Dq5oDLxApNevxKXc8= Modules/AcuantFaceMatch.swiftmodule/arm64.swiftmodule hash2 - A7ez2Y8gtEj2BngO4J/eKG74xkGn/fMkSMQpyGgaAow= + S1aWKW6yPQGRvxbUCMLObeeUCs8GMWMbbLouSn6g/Zw= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - KPi/4/JZ8E2JEa92ynksaH6Enx+1QxHyvxO9+I6WRZM= + Qer7tXO44VQwFvCuJgP8uaGDo8Hl9vMSZd7isIJh8qo= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - Hm5Gt0Aop20/27g+owkiTTrxSE1Z0mum3a2xdo4LdLM= + MTbwqkNVhlCl2+aEZ2BZDmeM3jOhTHW8sKRuQqhMUA4= Modules/AcuantFaceMatch.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - 6rHErdlIHIYPO3duoyHe7sXh5X/OtSsYQ82x7XL/7wo= + o+x1pPR54w50KPyLk87wvVMaCIa8bV2o8354oPpNEa4= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftdoc hash2 - KPi/4/JZ8E2JEa92ynksaH6Enx+1QxHyvxO9+I6WRZM= + Qer7tXO44VQwFvCuJgP8uaGDo8Hl9vMSZd7isIJh8qo= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftinterface hash2 - Hm5Gt0Aop20/27g+owkiTTrxSE1Z0mum3a2xdo4LdLM= + MTbwqkNVhlCl2+aEZ2BZDmeM3jOhTHW8sKRuQqhMUA4= Modules/AcuantFaceMatch.swiftmodule/x86_64.swiftmodule hash2 - 6rHErdlIHIYPO3duoyHe7sXh5X/OtSsYQ82x7XL/7wo= + o+x1pPR54w50KPyLk87wvVMaCIa8bV2o8354oPpNEa4= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/Info.plist b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/Info.plist index 675d71a..c654530 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/Info.plist +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath AcuantHGLiveness.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath AcuantHGLiveness.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/AcuantHGLiveness b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/AcuantHGLiveness index dd15c0c..59e7f8f 100755 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/AcuantHGLiveness and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/AcuantHGLiveness differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h index c407bc4..4217682 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTHGLIVENESS_SWIFT_H #define ACUANTHGLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -244,11 +244,21 @@ SWIFT_CLASS("_TtC16AcuantHGLiveness10HGLiveness") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class HGLivenessResult; SWIFT_PROTOCOL("_TtP16AcuantHGLiveness18HGLivenessDelegate_") @protocol HGLivenessDelegate -- (void)liveFaceCapturedWithImage:(UIImage * _Nullable)image; +- (void)liveFaceCapturedWithResult:(HGLivenessResult * _Nullable)result; +@end + +@class UIImage; +@class NSData; + +SWIFT_CLASS("_TtC16AcuantHGLiveness16HGLivenessResult") +@interface HGLivenessResult : NSObject +- (nonnull instancetype)initWithImage:(UIImage * _Nonnull)image jpegData:(NSData * _Nonnull)jpegData OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @class NSNumber; diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Info.plist index 285aa42..2275876 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftdoc index 9b4a5ea..a1341a7 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftinterface index f253782..f86e16f 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc index 9b4a5ea..a1341a7 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface index f253782..f86e16f 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/AcuantHGLiveness b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/AcuantHGLiveness index 541b683..7e3cc29 100755 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/AcuantHGLiveness and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/AcuantHGLiveness differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h index 5721777..2a9b00a 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Headers/AcuantHGLiveness-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTHGLIVENESS_SWIFT_H #define ACUANTHGLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -246,11 +246,21 @@ SWIFT_CLASS("_TtC16AcuantHGLiveness10HGLiveness") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class HGLivenessResult; SWIFT_PROTOCOL("_TtP16AcuantHGLiveness18HGLivenessDelegate_") @protocol HGLivenessDelegate -- (void)liveFaceCapturedWithImage:(UIImage * _Nullable)image; +- (void)liveFaceCapturedWithResult:(HGLivenessResult * _Nullable)result; +@end + +@class UIImage; +@class NSData; + +SWIFT_CLASS("_TtC16AcuantHGLiveness16HGLivenessResult") +@interface HGLivenessResult : NSObject +- (nonnull instancetype)initWithImage:(UIImage * _Nonnull)image jpegData:(NSData * _Nonnull)jpegData OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @class NSNumber; @@ -289,7 +299,7 @@ SWIFT_CLASS("_TtC16AcuantHGLiveness18LiveFaceRectDetail") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTHGLIVENESS_SWIFT_H #define ACUANTHGLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -535,11 +545,21 @@ SWIFT_CLASS("_TtC16AcuantHGLiveness10HGLiveness") - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -@class UIImage; +@class HGLivenessResult; SWIFT_PROTOCOL("_TtP16AcuantHGLiveness18HGLivenessDelegate_") @protocol HGLivenessDelegate -- (void)liveFaceCapturedWithImage:(UIImage * _Nullable)image; +- (void)liveFaceCapturedWithResult:(HGLivenessResult * _Nullable)result; +@end + +@class UIImage; +@class NSData; + +SWIFT_CLASS("_TtC16AcuantHGLiveness16HGLivenessResult") +@interface HGLivenessResult : NSObject +- (nonnull instancetype)initWithImage:(UIImage * _Nonnull)image jpegData:(NSData * _Nonnull)jpegData OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @class NSNumber; diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Info.plist index ba773ad..64ae8ca 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 9f65fba..a92e7a5 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface index da51d1a..bc23062 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc index 9f65fba..a92e7a5 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface index da51d1a..bc23062 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 6ff2081..f16bde0 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 71e9739..c266df4 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc index 6ff2081..f16bde0 100644 Binary files a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface index 71e9739..c266df4 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface @@ -1,11 +1,12 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantHGLiveness import AVFoundation import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency @objc @_inheritsConvenienceInitializers @objcMembers public class HGLiveness : ObjectiveC.NSObject { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @objc override dynamic public init() @@ -25,7 +26,7 @@ import UIKit } } @objc public protocol HGLivenessDelegate { - @objc func liveFaceCaptured(image: UIKit.UIImage?) + @objc func liveFaceCaptured(result: AcuantHGLiveness.HGLivenessResult?) } @objc @_inheritsConvenienceInitializers @objcMembers public class FaceCaptureSession : AVFoundation.AVCaptureSession, AVFoundation.AVCaptureVideoDataOutputSampleBufferDelegate { @objc public class func getFaceCaptureSession(delegate: AcuantHGLiveness.AcuantHGLiveFaceCaptureDelegate?, captureDevice: AVFoundation.AVCaptureDevice?) -> AcuantHGLiveness.FaceCaptureSession @@ -55,6 +56,10 @@ import UIKit @objc override dynamic public init() @objc deinit } +@objc @objcMembers public class HGLivenessResult : ObjectiveC.NSObject { + @objc public init(image: UIKit.UIImage, jpegData: Foundation.Data) + @objc deinit +} @objc public protocol AcuantHGLiveFaceCaptureDelegate { @objc func liveFaceDetailsCaptured(liveFaceDetails: AcuantHGLiveness.LiveFaceDetails?, faceType: AcuantHGLiveness.AcuantFaceType) } diff --git a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/_CodeSignature/CodeResources index 0381ec5..d0f803f 100644 --- a/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantHGLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantHGLiveness.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantHGLiveness-Swift.h - IhJ1f5tBOo+o3fOoCgenzeVZGZM= + +qbkqdHcSZ3JPNwVCxJhD3xJIfw= Headers/MiniLiveFaceSDK.h @@ -14,55 +14,55 @@ Info.plist - F+Tmh4a2uwjy3A6AjEamecbM2Eg= + MxuKmlMTvRWAQkXPesrt/yVYWlg= Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc - 4GZsHpZQJrCbgvZrtv9rqNUO1rg= + Dkc212d3szkpina5pqtX6xVECmA= Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface - 3VevrqTYlXncBZSk3rabaMsbQNY= + 2ML1WzUKiD8pEpR8Hojn0NRyjyM= Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule - mDjWqJ51mvY+7Fq2T857uBsy5ic= + bD+fmTRyikHbl1osKkRGmd8EEdM= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc - 4GZsHpZQJrCbgvZrtv9rqNUO1rg= + Dkc212d3szkpina5pqtX6xVECmA= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface - 3VevrqTYlXncBZSk3rabaMsbQNY= + 2ML1WzUKiD8pEpR8Hojn0NRyjyM= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftmodule - mDjWqJ51mvY+7Fq2T857uBsy5ic= + bD+fmTRyikHbl1osKkRGmd8EEdM= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - lq/D1BgsOTkEVs80KWqheGtkDP8= + dtTQqMeVGVvu269KVPWoXQexji8= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - FLE9fGFzPOldTPsFb34lcRrhgM8= + Izk0CvWmEk/37Ba0yQSckT0HlYg= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - 4EglGgd7K7RYCacwBg3JPadLZJw= + r8QTVKunvsgeCtluP5ea2l5AMKM= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc - lq/D1BgsOTkEVs80KWqheGtkDP8= + dtTQqMeVGVvu269KVPWoXQexji8= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface - FLE9fGFzPOldTPsFb34lcRrhgM8= + Izk0CvWmEk/37Ba0yQSckT0HlYg= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftmodule - 4EglGgd7K7RYCacwBg3JPadLZJw= + r8QTVKunvsgeCtluP5ea2l5AMKM= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - TnrxYm1HX/xhvZN2Q65bImwDK6OJb/kZi8enT/cOjc8= + WRG3ibGoi1j790N/lw7D5Nf0fjgBkRmmGhKxTPIoVvo= Headers/MiniLiveFaceSDK.h @@ -89,84 +89,84 @@ hash2 - +6oEt0SJHyivecTIfmepp4oYm+IE8sjtPU2GJbolT54= + cV2arVN97+ZrEkShqfQscpmclkhuFaVRXmyOy+gYHOM= Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - 76xL/5+wy8spmpipJwz8MsIc5VM7Nl8r3m5RzVw9wzw= + IheyRQ4nRjwCV+i8CaDf8UCKQTCDe70W0oSW58mk7kU= Modules/AcuantHGLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - mNcB/pC17WNWVheLWWN8nDWJ6HqxOpZqngUQTq91ogY= + qHNY8jQlvj+PuIkGeFRlZDwLNWmtJXCjPoqvHA8Y5UA= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftdoc hash2 - +6oEt0SJHyivecTIfmepp4oYm+IE8sjtPU2GJbolT54= + cV2arVN97+ZrEkShqfQscpmclkhuFaVRXmyOy+gYHOM= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftinterface hash2 - 76xL/5+wy8spmpipJwz8MsIc5VM7Nl8r3m5RzVw9wzw= + IheyRQ4nRjwCV+i8CaDf8UCKQTCDe70W0oSW58mk7kU= Modules/AcuantHGLiveness.swiftmodule/arm64.swiftmodule hash2 - mNcB/pC17WNWVheLWWN8nDWJ6HqxOpZqngUQTq91ogY= + qHNY8jQlvj+PuIkGeFRlZDwLNWmtJXCjPoqvHA8Y5UA= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - 4YBYhMOkXrg9bH3+NXzp0vWoHToRSyQ55jYlBMTybW4= + sFi06ov8i1NC9/FVnlbs7vghVf0kkGLZGSK0h2EDKHQ= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - VgVcJeEY9DE5FvapmVCHp/7hPC2WKz5+ksaAuoyn8OI= + 4/dNuvpqsff5RXUWyprdaKAG/UsIH1C4ck2sKQiKg+Y= Modules/AcuantHGLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - QVov7rW6yCw+vD3M6cJD0abr/opJXcI6eB79/atVKx8= + t7JT5HOOlgOptcc84bNVs5K5oQF/kd1VMQtPxtHWBQU= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftdoc hash2 - 4YBYhMOkXrg9bH3+NXzp0vWoHToRSyQ55jYlBMTybW4= + sFi06ov8i1NC9/FVnlbs7vghVf0kkGLZGSK0h2EDKHQ= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftinterface hash2 - VgVcJeEY9DE5FvapmVCHp/7hPC2WKz5+ksaAuoyn8OI= + 4/dNuvpqsff5RXUWyprdaKAG/UsIH1C4ck2sKQiKg+Y= Modules/AcuantHGLiveness.swiftmodule/x86_64.swiftmodule hash2 - QVov7rW6yCw+vD3M6cJD0abr/opJXcI6eB79/atVKx8= + t7JT5HOOlgOptcc84bNVs5K5oQF/kd1VMQtPxtHWBQU= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/AcuantIPLiveness b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/AcuantIPLiveness index 73ff5fc..8da3fc9 100755 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/AcuantIPLiveness and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/AcuantIPLiveness differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h index 742e0e5..b0e65a7 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIPLIVENESS_SWIFT_H #define ACUANTIPLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -212,14 +212,12 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @protocol LivenessTestDelegate; @class NSString; @protocol LivenessTestResultDelegate; -@protocol LivenessTestCredentialDelegate; SWIFT_CLASS("_TtC16AcuantIPLiveness10IPLiveness") @interface IPLiveness : NSObject + (void)performLivenessSetupWithDelegate:(id _Nonnull)delegate; + (void)performLivenessTestWithSetupResult:(LivenessSetupResult * _Nonnull)setupResult delegate:(id _Nonnull)delegate; + (void)getLivenessTestResultWithToken:(NSString * _Nonnull)token userId:(NSString * _Nonnull)userId delegate:(id _Nonnull)delegate; -+ (void)getLivenessTestCredentialWithDelegate:(id _Nonnull)delegate; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -254,13 +252,6 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness19LivenessSetupResult") @class NSNumber; -SWIFT_PROTOCOL("_TtP16AcuantIPLiveness30LivenessTestCredentialDelegate_") -@protocol LivenessTestCredentialDelegate -- (void)livenessTestCredentialReceivedWithResult:(BOOL)result; -- (void)livenessTestCredentialReceiveFailedWithError:(AcuantError * _Nonnull)error; -@end - - SWIFT_PROTOCOL("_TtP16AcuantIPLiveness20LivenessTestDelegate_") @protocol LivenessTestDelegate - (void)livenessTestCompleted; @@ -290,7 +281,7 @@ SWIFT_PROTOCOL("_TtP16AcuantIPLiveness26LivenessTestResultDelegate_") @class NSLocale; @class UIColor; @protocol IProovPresentationDelegate; -@class Options; +@class IPOptions; SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @interface LivenessUiOptions : NSObject @@ -306,7 +297,7 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @property (nonatomic, copy) NSArray * _Nullable fonts; @property (nonatomic, strong) UIImage * _Nullable logoImage; @property (nonatomic, weak) id _Nullable delegate; -- (Options * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; +- (IPOptions * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Info.plist index ce005eb..eb2e4ce 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftdoc index 80990e1..02db94c 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftinterface index 924b4be..68014ba 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc index 80990e1..02db94c 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface index 924b4be..68014ba 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/AcuantIPLiveness b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/AcuantIPLiveness index ed4d5dc..ff7b804 100755 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/AcuantIPLiveness and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/AcuantIPLiveness differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h index 9b59709..c5975b9 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Headers/AcuantIPLiveness-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIPLIVENESS_SWIFT_H #define ACUANTIPLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -214,14 +214,12 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @protocol LivenessTestDelegate; @class NSString; @protocol LivenessTestResultDelegate; -@protocol LivenessTestCredentialDelegate; SWIFT_CLASS("_TtC16AcuantIPLiveness10IPLiveness") @interface IPLiveness : NSObject + (void)performLivenessSetupWithDelegate:(id _Nonnull)delegate; + (void)performLivenessTestWithSetupResult:(LivenessSetupResult * _Nonnull)setupResult delegate:(id _Nonnull)delegate; + (void)getLivenessTestResultWithToken:(NSString * _Nonnull)token userId:(NSString * _Nonnull)userId delegate:(id _Nonnull)delegate; -+ (void)getLivenessTestCredentialWithDelegate:(id _Nonnull)delegate; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -256,13 +254,6 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness19LivenessSetupResult") @class NSNumber; -SWIFT_PROTOCOL("_TtP16AcuantIPLiveness30LivenessTestCredentialDelegate_") -@protocol LivenessTestCredentialDelegate -- (void)livenessTestCredentialReceivedWithResult:(BOOL)result; -- (void)livenessTestCredentialReceiveFailedWithError:(AcuantError * _Nonnull)error; -@end - - SWIFT_PROTOCOL("_TtP16AcuantIPLiveness20LivenessTestDelegate_") @protocol LivenessTestDelegate - (void)livenessTestCompleted; @@ -292,7 +283,7 @@ SWIFT_PROTOCOL("_TtP16AcuantIPLiveness26LivenessTestResultDelegate_") @class NSLocale; @class UIColor; @protocol IProovPresentationDelegate; -@class Options; +@class IPOptions; SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @interface LivenessUiOptions : NSObject @@ -308,7 +299,7 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @property (nonatomic, copy) NSArray * _Nullable fonts; @property (nonatomic, strong) UIImage * _Nullable logoImage; @property (nonatomic, weak) id _Nullable delegate; -- (Options * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; +- (IPOptions * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -319,7 +310,7 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIPLIVENESS_SWIFT_H #define ACUANTIPLIVENESS_SWIFT_H #pragma clang diagnostic push @@ -533,14 +524,12 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @protocol LivenessTestDelegate; @class NSString; @protocol LivenessTestResultDelegate; -@protocol LivenessTestCredentialDelegate; SWIFT_CLASS("_TtC16AcuantIPLiveness10IPLiveness") @interface IPLiveness : NSObject + (void)performLivenessSetupWithDelegate:(id _Nonnull)delegate; + (void)performLivenessTestWithSetupResult:(LivenessSetupResult * _Nonnull)setupResult delegate:(id _Nonnull)delegate; + (void)getLivenessTestResultWithToken:(NSString * _Nonnull)token userId:(NSString * _Nonnull)userId delegate:(id _Nonnull)delegate; -+ (void)getLivenessTestCredentialWithDelegate:(id _Nonnull)delegate; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -575,13 +564,6 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness19LivenessSetupResult") @class NSNumber; -SWIFT_PROTOCOL("_TtP16AcuantIPLiveness30LivenessTestCredentialDelegate_") -@protocol LivenessTestCredentialDelegate -- (void)livenessTestCredentialReceivedWithResult:(BOOL)result; -- (void)livenessTestCredentialReceiveFailedWithError:(AcuantError * _Nonnull)error; -@end - - SWIFT_PROTOCOL("_TtP16AcuantIPLiveness20LivenessTestDelegate_") @protocol LivenessTestDelegate - (void)livenessTestCompleted; @@ -611,7 +593,7 @@ SWIFT_PROTOCOL("_TtP16AcuantIPLiveness26LivenessTestResultDelegate_") @class NSLocale; @class UIColor; @protocol IProovPresentationDelegate; -@class Options; +@class IPOptions; SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @interface LivenessUiOptions : NSObject @@ -627,7 +609,7 @@ SWIFT_CLASS("_TtC16AcuantIPLiveness17LivenessUiOptions") @property (nonatomic, copy) NSArray * _Nullable fonts; @property (nonatomic, strong) UIImage * _Nullable logoImage; @property (nonatomic, weak) id _Nullable delegate; -- (Options * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; +- (IPOptions * _Nonnull)toIProovOptions SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Info.plist index feec47c..ecd777e 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc index fcb86cd..1a67076 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 2cb473a..be2f4fc 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc index fcb86cd..1a67076 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface index 2cb473a..be2f4fc 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 8979774..3c2791e 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 2ea85fa..3022506 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc index 8979774..3c2791e 100644 Binary files a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface index 2ea85fa..3022506 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface @@ -1,10 +1,11 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantIPLiveness import AcuantCommon import Foundation import Swift import UIKit +import _Concurrency import iProov @objc @objcMembers public class LivenessSetupResult : ObjectiveC.NSObject { @objc public var apiKey: Swift.String @@ -14,7 +15,6 @@ import iProov @objc public var ui: AcuantIPLiveness.LivenessUiOptions @objc public init(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) @objc public class func createInstance(apiKey: Swift.String, token: Swift.String, userId: Swift.String, apiEndpoint: Swift.String) -> AcuantIPLiveness.LivenessSetupResult - @objc override dynamic public init() @objc deinit } @objc public protocol LivenessSetupDelegate { @@ -32,15 +32,10 @@ import iProov @objc func livenessTestResultReceived(result: AcuantIPLiveness.LivenessTestResult) @objc func livenessTestResultReceiveFailed(error: AcuantCommon.AcuantError) } -@objc public protocol LivenessTestCredentialDelegate { - @objc func livenessTestCredentialReceived(result: Swift.Bool) - @objc func livenessTestCredentialReceiveFailed(error: AcuantCommon.AcuantError) -} @objc @_inheritsConvenienceInitializers @objcMembers public class IPLiveness : ObjectiveC.NSObject { @objc public class func performLivenessSetup(delegate: AcuantIPLiveness.LivenessSetupDelegate) @objc public class func performLivenessTest(setupResult: AcuantIPLiveness.LivenessSetupResult, delegate: AcuantIPLiveness.LivenessTestDelegate) @objc public class func getLivenessTestResult(token: Swift.String, userId: Swift.String, delegate: AcuantIPLiveness.LivenessTestResultDelegate) - @objc public class func getLivenessTestCredential(delegate: AcuantIPLiveness.LivenessTestCredentialDelegate) @objc override dynamic public init() @objc deinit } @@ -58,6 +53,7 @@ import iProov @objc public var boldFont: Swift.String? @objc public var fonts: [Swift.String]? @objc public var logoImage: UIKit.UIImage? + @available(*, deprecated, message: "This option is no longer supported, setting it will not change anything") public var scanLineDisabled: Swift.Bool? @objc weak public var delegate: iProov.IProovPresentationDelegate? @objc public func toIProovOptions() -> iProov.Options diff --git a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/_CodeSignature/CodeResources index 6002fd6..490396e 100644 --- a/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantIPLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantIPLiveness.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantIPLiveness-Swift.h - JTK1kPB1b2q5rHOKBc2joxFpFQ8= + QpFEUDfhA6ZilIDc9OFDvmXNyQE= Headers/LiveFaceSDK.h @@ -14,55 +14,55 @@ Info.plist - lDgqkQIXGHUcD7GqonhMu9XKHHY= + zCJwekEQdC3sEuSj0IVMHrLer6U= Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc - /0vmzsgradaJd74hxu0E4Zu0EJ0= + d/yKmVm5qxPM77HNkRjolQ5uPms= Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface - szzs+ksV5lPmmPOsJCMKlQmkn5I= + 3oiAujlJK6wCIldoRaxkpjiQ6aY= Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule - Z2FZaa4hx1ZH0Q9tefrlkxwzkd8= + 0jzyrg2BcnW13XtkDrui8o54T6U= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc - /0vmzsgradaJd74hxu0E4Zu0EJ0= + d/yKmVm5qxPM77HNkRjolQ5uPms= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface - szzs+ksV5lPmmPOsJCMKlQmkn5I= + 3oiAujlJK6wCIldoRaxkpjiQ6aY= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftmodule - Z2FZaa4hx1ZH0Q9tefrlkxwzkd8= + 0jzyrg2BcnW13XtkDrui8o54T6U= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - nlUsx0d6jMOctbFJ6htlDx/0iBk= + QqA5IRYrO/9D72GqUeKqwTP0aC4= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - kyacQL1SC79ZPr24QDKq5FvQcdg= + 8hC42KDA562m+9RmaAo5/5ACHf8= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - Sr3GT4sC7BpenjPPtKNJRFDH6Ys= + aYBMNarHt0uWV+OvpZ3+dT9+vhk= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc - nlUsx0d6jMOctbFJ6htlDx/0iBk= + QqA5IRYrO/9D72GqUeKqwTP0aC4= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface - kyacQL1SC79ZPr24QDKq5FvQcdg= + 8hC42KDA562m+9RmaAo5/5ACHf8= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftmodule - Sr3GT4sC7BpenjPPtKNJRFDH6Ys= + aYBMNarHt0uWV+OvpZ3+dT9+vhk= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - jzPd52cfL/ecFyDJ0gI5zt8NONzJpAGfum5vMkiQ/O8= + C2NB2SAmSMeE/98xwkb3x+Hlq0Uz4JIsQRfZDqZmlkI= Headers/LiveFaceSDK.h @@ -89,84 +89,84 @@ hash2 - o0ka+ayRDckholy3zS8PlT8Kbk/wMJgkDujd7VrTL9w= + Exs6MHh/4wqqGstqQG6DDnXtdqK9f8j8wMPEg8zI9Q8= Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - BBKPWcZdjXbm8H+G7N6TVMtoROK9TfI0h4Xa6SFNONc= + g7cgQySkM/03KCtJZOqj8oswDi7ZTefR2CaMzxqo9Qs= Modules/AcuantIPLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - ZtyHNg2ErFILDUkChRtxuCj7v0W4mhXOL38TjE+XEw4= + a45QvO7KDIik7S4E7DyHpJNQpDkjq52BKU7yH6k49Zw= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftdoc hash2 - o0ka+ayRDckholy3zS8PlT8Kbk/wMJgkDujd7VrTL9w= + Exs6MHh/4wqqGstqQG6DDnXtdqK9f8j8wMPEg8zI9Q8= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftinterface hash2 - BBKPWcZdjXbm8H+G7N6TVMtoROK9TfI0h4Xa6SFNONc= + g7cgQySkM/03KCtJZOqj8oswDi7ZTefR2CaMzxqo9Qs= Modules/AcuantIPLiveness.swiftmodule/arm64.swiftmodule hash2 - ZtyHNg2ErFILDUkChRtxuCj7v0W4mhXOL38TjE+XEw4= + a45QvO7KDIik7S4E7DyHpJNQpDkjq52BKU7yH6k49Zw= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - 1TtuxTqyG2duGCkLSWi9Fb9V42260a5Jj0WGMzw2z9k= + cuBs3eXWZ/JFt1crsidQ1qjdpqvIhTxF3ltL7IsRD6Y= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - vRIERAIV4KxqfOVpf/Te12jZwLDg0HBROtYo7dvqexs= + RfOBzwryzk9Ca9+Zy+NPwo5Atcha4eCBfzSAEveA4B8= Modules/AcuantIPLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - qPoZy1XIuXPUBz/p49yFUx4HcJmoZfmd/WAEE9JKEjc= + WuMPlvtXkJbGB0S1wiYkVQxjwj57hJSEYsR7xBrFv0U= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftdoc hash2 - 1TtuxTqyG2duGCkLSWi9Fb9V42260a5Jj0WGMzw2z9k= + cuBs3eXWZ/JFt1crsidQ1qjdpqvIhTxF3ltL7IsRD6Y= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftinterface hash2 - vRIERAIV4KxqfOVpf/Te12jZwLDg0HBROtYo7dvqexs= + RfOBzwryzk9Ca9+Zy+NPwo5Atcha4eCBfzSAEveA4B8= Modules/AcuantIPLiveness.swiftmodule/x86_64.swiftmodule hash2 - qPoZy1XIuXPUBz/p49yFUx4HcJmoZfmd/WAEE9JKEjc= + WuMPlvtXkJbGB0S1wiYkVQxjwj57hJSEYsR7xBrFv0U= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/AcuantImagePreparation b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/AcuantImagePreparation index 7452cce..9cd6811 100755 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/AcuantImagePreparation and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/AcuantImagePreparation differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h index 04e4dbf..932298a 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIMAGEPREPARATION_SWIFT_H #define ACUANTIMAGEPREPARATION_SWIFT_H #pragma clang diagnostic push @@ -227,6 +227,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation10DetectData") @protocol InitializationDelegate; @class NSNumber; +@class NSData; SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") @interface ImagePreparation : NSObject @@ -239,6 +240,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") + (Image * _Nonnull)detectWithData:(CroppingData * _Nonnull)data SWIFT_WARN_UNUSED_RESULT; + (NSInteger)sharpnessWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; + (NSInteger)glareWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; ++ (NSData * _Nullable)signWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Info.plist b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Info.plist index 7a90082..c90fb69 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Info.plist and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftdoc index 1e21885..d74a1f8 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftinterface index 0527719..776a831 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc index 1e21885..d74a1f8 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface index 0527719..776a831 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/AcuantImagePreparation b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/AcuantImagePreparation index 66f7dcd..354c8ec 100755 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/AcuantImagePreparation and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/AcuantImagePreparation differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h index f57a716..44a2ca2 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Headers/AcuantImagePreparation-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIMAGEPREPARATION_SWIFT_H #define ACUANTIMAGEPREPARATION_SWIFT_H #pragma clang diagnostic push @@ -229,6 +229,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation10DetectData") @protocol InitializationDelegate; @class NSNumber; +@class NSData; SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") @interface ImagePreparation : NSObject @@ -241,6 +242,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") + (Image * _Nonnull)detectWithData:(CroppingData * _Nonnull)data SWIFT_WARN_UNUSED_RESULT; + (NSInteger)sharpnessWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; + (NSInteger)glareWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; ++ (NSData * _Nullable)signWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -260,7 +262,7 @@ SWIFT_PROTOCOL("_TtP22AcuantImagePreparation22InitializationDelegate_") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTIMAGEPREPARATION_SWIFT_H #define ACUANTIMAGEPREPARATION_SWIFT_H #pragma clang diagnostic push @@ -489,6 +491,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation10DetectData") @protocol InitializationDelegate; @class NSNumber; +@class NSData; SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") @interface ImagePreparation : NSObject @@ -501,6 +504,7 @@ SWIFT_CLASS("_TtC22AcuantImagePreparation16ImagePreparation") + (Image * _Nonnull)detectWithData:(CroppingData * _Nonnull)data SWIFT_WARN_UNUSED_RESULT; + (NSInteger)sharpnessWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; + (NSInteger)glareWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; ++ (NSData * _Nullable)signWithImage:(UIImage * _Nonnull)image SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Info.plist b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Info.plist index 5f25bad..bf53f23 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Info.plist and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 6517618..486f7b4 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 4cbd483..fe575f9 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc index 6517618..486f7b4 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface index 4cbd483..fe575f9 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 855085d..5b012ce 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index bd97644..55aa4c9 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc index 855085d..5b012ce 100644 Binary files a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface index bd97644..55aa4c9 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface @@ -1,12 +1,14 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantImagePreparation import AVFoundation import AcuantCommon @_exported import AcuantImagePreparation +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public class CameraMetaData : Swift.Codable { public init() public func setCaptureType(captureType: Swift.String) -> AcuantImagePreparation.CameraMetaData @@ -16,7 +18,6 @@ public class CameraMetaData : Swift.Codable { } @objc @_hasMissingDesignatedInitializers @objcMembers public class DetectData : ObjectiveC.NSObject { @objc public class func newInstance(image: UIKit.UIImage) -> AcuantImagePreparation.DetectData - @objc override dynamic public init() @objc deinit } @objc public protocol InitializationDelegate { @@ -45,6 +46,7 @@ public class CameraMetaData : Swift.Codable { @objc public class func detect(data: AcuantImagePreparation.CroppingData) -> AcuantCommon.Image @objc public class func sharpness(image: UIKit.UIImage) -> Swift.Int @objc public class func glare(image: UIKit.UIImage) -> Swift.Int + @objc public class func sign(image: UIKit.UIImage) -> Foundation.Data? @objc override dynamic public init() @objc deinit } diff --git a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/_CodeSignature/CodeResources index 1742fef..1053f51 100644 --- a/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantImagePreparation.xcframework/ios-arm64_x86_64-simulator/AcuantImagePreparation.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantImagePreparation-Swift.h - pJ3o+kkhGzMrjTwPqiZmiri4GdY= + dRa6pX5DQyUM9rBPkn/7BHr+ags= Headers/AcuantImagePreparation.h @@ -14,7 +14,7 @@ Info.plist - smSKOJdvpoNON073H0aPE3RQKTs= + chWdCONQMQNEQQtuyHrGZH3bBK0= LICENSE.rst @@ -22,51 +22,51 @@ Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftdoc - uTjb1UkWdkbdDArD3eAmBx1dt1k= + xoprpHrM6owNXalW0ibkCWt5o3Y= Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface - 52L74TY1lL6aY9ML0d4htriUn94= + sPe2VEjW3KDbGxc6fYD8/t8cPAc= Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftmodule - IPz7lKIzQUylRt3YQrVjicG/I4E= + m97QunIqDHieWOgItgydWdUC19w= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc - uTjb1UkWdkbdDArD3eAmBx1dt1k= + xoprpHrM6owNXalW0ibkCWt5o3Y= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface - 52L74TY1lL6aY9ML0d4htriUn94= + sPe2VEjW3KDbGxc6fYD8/t8cPAc= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftmodule - IPz7lKIzQUylRt3YQrVjicG/I4E= + m97QunIqDHieWOgItgydWdUC19w= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - y4+YawInW00oGhaBeBj0HpJh1bg= + f3e1KYCg7kZ82O9Cv4v6SIhKcJQ= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - qlrlkXZ2UoKX+xgX5ydhIdmDh6o= + YHBMIzPUXWQc5FtF/OxbBl6JhNM= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - NZxryKUgVcCqE5wbvRgrxzko8TA= + 87JL0ePgtZj/QP3MriWNcAsq0wE= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc - y4+YawInW00oGhaBeBj0HpJh1bg= + f3e1KYCg7kZ82O9Cv4v6SIhKcJQ= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface - qlrlkXZ2UoKX+xgX5ydhIdmDh6o= + YHBMIzPUXWQc5FtF/OxbBl6JhNM= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftmodule - NZxryKUgVcCqE5wbvRgrxzko8TA= + 87JL0ePgtZj/QP3MriWNcAsq0wE= Modules/module.modulemap @@ -83,7 +83,7 @@ hash2 - kTFCp8LA9CUMUoB8wKmkJH6AOv9nAQawwGvzUMK1h1k= + lNGNr74QhX2cKbvNPif+L8kHQgnyei2HOs23+pfFDZo= Headers/AcuantImagePreparation.h @@ -104,84 +104,84 @@ hash2 - K6e+95ZEm61xEC7xVQ5gGfMoK4ZCKgmwoGEIuuvI8E4= + 0Xmf0m73gTGBZ1sng8e2Qs7waKBRFKtVz+lZcur3HQU= Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - Uv0tGJWdJbs4+ZCoT5rRNg1MUUm0A7MR+a7Qdq++vsY= + VhrZF6FzP+4EvWDVQ0oyOjh9vVhzo/twP/N2tKQiOxg= Modules/AcuantImagePreparation.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - W6IcxzgZKNBwJ9MVN9/ISQHZs4z2sTO2y5ssm2/zGzI= + XWEUUGOhcCehQLb3NpGPrd+5Ak7FW6U5biIKIuhIPz4= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftdoc hash2 - K6e+95ZEm61xEC7xVQ5gGfMoK4ZCKgmwoGEIuuvI8E4= + 0Xmf0m73gTGBZ1sng8e2Qs7waKBRFKtVz+lZcur3HQU= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftinterface hash2 - Uv0tGJWdJbs4+ZCoT5rRNg1MUUm0A7MR+a7Qdq++vsY= + VhrZF6FzP+4EvWDVQ0oyOjh9vVhzo/twP/N2tKQiOxg= Modules/AcuantImagePreparation.swiftmodule/arm64.swiftmodule hash2 - W6IcxzgZKNBwJ9MVN9/ISQHZs4z2sTO2y5ssm2/zGzI= + XWEUUGOhcCehQLb3NpGPrd+5Ak7FW6U5biIKIuhIPz4= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - GqLMOjYsrC+hi8YlmnVh15BBazA8BVPv5KjnIFPWkOo= + W9oiRHjP8zQJYNUYThxeofBn4BC9rGrchIWNmLHHF1c= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - TRuiALVw6nSptHe9AfvFk4rAI01E5zJShEgr7aGhzVY= + sOWvdX9q/zQIo7r93s7Gn+sXjxhx1Uj61G0J2hYJzpo= Modules/AcuantImagePreparation.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - xaqonyGknAVH0TASUb/gOlLLPTq8rdslqMEQa+ETPVo= + v2906UUnAd/jdh3nOjyZ7U5t3vf+4N9pppvaqq8H2GQ= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftdoc hash2 - GqLMOjYsrC+hi8YlmnVh15BBazA8BVPv5KjnIFPWkOo= + W9oiRHjP8zQJYNUYThxeofBn4BC9rGrchIWNmLHHF1c= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftinterface hash2 - TRuiALVw6nSptHe9AfvFk4rAI01E5zJShEgr7aGhzVY= + sOWvdX9q/zQIo7r93s7Gn+sXjxhx1Uj61G0J2hYJzpo= Modules/AcuantImagePreparation.swiftmodule/x86_64.swiftmodule hash2 - xaqonyGknAVH0TASUb/gOlLLPTq8rdslqMEQa+ETPVo= + v2906UUnAd/jdh3nOjyZ7U5t3vf+4N9pppvaqq8H2GQ= Modules/module.modulemap diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/Info.plist b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/Info.plist index d2c0f90..12192a1 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/Info.plist +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/Info.plist @@ -6,30 +6,30 @@ LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath AcuantPassiveLiveness.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath AcuantPassiveLiveness.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/AcuantPassiveLiveness b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/AcuantPassiveLiveness index 295db47..ccda1d7 100755 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/AcuantPassiveLiveness and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/AcuantPassiveLiveness differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h index 49d2012..39e9815 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTPASSIVELIVENESS_SWIFT_H #define ACUANTPASSIVELIVENESS_SWIFT_H #pragma clang diagnostic push diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Info.plist index 7684b3e..7f999d4 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftdoc index b405436..cc2e2f6 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftinterface index b28d643..3f7286d 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc index b405436..cc2e2f6 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface index b28d643..3f7286d 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/AcuantPassiveLiveness b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/AcuantPassiveLiveness index 6e65342..205ea8f 100755 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/AcuantPassiveLiveness and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/AcuantPassiveLiveness differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h index ecf95ef..a97d2e3 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Headers/AcuantPassiveLiveness-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTPASSIVELIVENESS_SWIFT_H #define ACUANTPASSIVELIVENESS_SWIFT_H #pragma clang diagnostic push @@ -214,7 +214,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef ACUANTPASSIVELIVENESS_SWIFT_H #define ACUANTPASSIVELIVENESS_SWIFT_H #pragma clang diagnostic push diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Info.plist b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Info.plist index 9ac1992..f1cf784 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Info.plist and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Info.plist differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 59373fa..f628842 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface index f698a17..50448cc 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc index 59373fa..f628842 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface index f698a17..50448cc 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target arm64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index ef3d26d..a4ee6c2 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 18fc8c4..160b3e5 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc index ef3d26d..a4ee6c2 100644 Binary files a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface index 18fc8c4..160b3e5 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface @@ -1,11 +1,13 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57) +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) // swift-module-flags: -target x86_64-apple-ios11.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name AcuantPassiveLiveness import AcuantCommon @_exported import AcuantPassiveLiveness +import CoreImage import Foundation import Swift import UIKit +import _Concurrency public enum AcuantLivenessAssessment : Swift.String { case Error case PoorQuality @@ -18,8 +20,8 @@ public enum AcuantLivenessAssessment : Swift.String { } } public class AcuantLivenessRequest { - final public let image: UIKit.UIImage - public init(image: UIKit.UIImage) + final public let jpegData: Foundation.Data + public init(jpegData: Foundation.Data) @objc deinit } public class AcuantLivenessError { diff --git a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/_CodeSignature/CodeResources index 5382e09..c067665 100644 --- a/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/AcuantPassiveLiveness.xcframework/ios-arm64_x86_64-simulator/AcuantPassiveLiveness.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/AcuantPassiveLiveness-Swift.h - /4PhlHFB2IvdVqAgZdDXfK5LKD8= + OpaNFsgRkJrOEk7Uk6CZeWYEdHQ= Headers/AcuantPassiveLiveness.h @@ -14,55 +14,55 @@ Info.plist - IwgcmycQonYOxSJ2ub51K7pdTLA= + PnMnRdrxqARRu3Va/VxjKsV+rDI= Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftdoc - SQUhtlhk7DH+9KKT4h2/RjUwVSs= + fe1WvXxTe/8R0qO5leFGSFWH++c= Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface - o8FdVGWVxEkRtWaHvEf9X6Srdsk= + BbpqOhAMuaE0vdAAu264Otv5SPI= Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule - 4j5uJbIfuIghg93g3L01wQ3z9jY= + C0U+4TinSRqRmxzZe7Dy5jYsE+A= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc - SQUhtlhk7DH+9KKT4h2/RjUwVSs= + fe1WvXxTe/8R0qO5leFGSFWH++c= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface - o8FdVGWVxEkRtWaHvEf9X6Srdsk= + BbpqOhAMuaE0vdAAu264Otv5SPI= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftmodule - 4j5uJbIfuIghg93g3L01wQ3z9jY= + C0U+4TinSRqRmxzZe7Dy5jYsE+A= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - 9SSpkZ5RgPfrQjGXfnk1via4D2Y= + 7lFQCOaSeKVioBYYE1/2B457VJY= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - 3kbkzesCN+t5Ut3aGE/PlM6DouM= + 7Jaqts4xtzAU6pVb8dHH0tV9h1g= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - HBBLlbFkkMLWzYKrINbSTwSFqls= + cJiIPsgyHdcO67EF9C3eW/I601s= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc - 9SSpkZ5RgPfrQjGXfnk1via4D2Y= + 7lFQCOaSeKVioBYYE1/2B457VJY= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface - 3kbkzesCN+t5Ut3aGE/PlM6DouM= + 7Jaqts4xtzAU6pVb8dHH0tV9h1g= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftmodule - HBBLlbFkkMLWzYKrINbSTwSFqls= + cJiIPsgyHdcO67EF9C3eW/I601s= Modules/module.modulemap @@ -75,7 +75,7 @@ hash2 - 4lgrj7e1DorS4QiSeb2ftgkR2rwBCZrasF6/sHRF0i8= + hhn2tA3exzFzjvpXTMEGzBJrOtfYSkwQUyJ1fKVnnfw= Headers/AcuantPassiveLiveness.h @@ -89,84 +89,84 @@ hash2 - B0uCn4ZRdnl1EHvTABtoep35mhoJn0aJ/xWWYQi6IW8= + 3JZnIFdBMmaYuK4SXe6k6ug0QbY2izINoDYjmH7QkBo= Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash2 - C+OePwHmUbtfxQ0z3yK2CXRaUGtwmBaY62d1HR3FJ2Y= + /3jyh3kvBCgESGspdu8bRhohk5kfs3u29WLyOol9INY= Modules/AcuantPassiveLiveness.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - duVU9ZRANo+UJDmpnDgAS3dZnp3Tl/BXnr9Js7HyrvU= + 5kD4+GMxSHGLKBS/JbauXDSAxHwVv8o30G0S9x8L1Jc= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftdoc hash2 - B0uCn4ZRdnl1EHvTABtoep35mhoJn0aJ/xWWYQi6IW8= + 3JZnIFdBMmaYuK4SXe6k6ug0QbY2izINoDYjmH7QkBo= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftinterface hash2 - C+OePwHmUbtfxQ0z3yK2CXRaUGtwmBaY62d1HR3FJ2Y= + /3jyh3kvBCgESGspdu8bRhohk5kfs3u29WLyOol9INY= Modules/AcuantPassiveLiveness.swiftmodule/arm64.swiftmodule hash2 - duVU9ZRANo+UJDmpnDgAS3dZnp3Tl/BXnr9Js7HyrvU= + 5kD4+GMxSHGLKBS/JbauXDSAxHwVv8o30G0S9x8L1Jc= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash2 - OIICLtAU8kGuZ+GisiygbFNVvhOLtqmSyB+csQeCXOY= + igm7RzoXK6OnC0/rBk3Dnwt5bO50aJR/gtafKKoduXA= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash2 - +xA50MTp0LMU7Hlm9/fAjh8WCckmuqrwr3eq5Nhl6G0= + u1FhPwUIGz8V43ULq2pHnFL17XrOTtULP56W53yMXd4= Modules/AcuantPassiveLiveness.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - z0YGrP9rNA87ZNbMvywvnoyYj1KVyHtc3L4p34NjXeE= + qaZd0aWBhCQgnOc6jep1O/Q4c7S8COG/QAHXvV0aN3M= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftdoc hash2 - OIICLtAU8kGuZ+GisiygbFNVvhOLtqmSyB+csQeCXOY= + igm7RzoXK6OnC0/rBk3Dnwt5bO50aJR/gtafKKoduXA= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftinterface hash2 - +xA50MTp0LMU7Hlm9/fAjh8WCckmuqrwr3eq5Nhl6G0= + u1FhPwUIGz8V43ULq2pHnFL17XrOTtULP56W53yMXd4= Modules/AcuantPassiveLiveness.swiftmodule/x86_64.swiftmodule hash2 - z0YGrP9rNA87ZNbMvywvnoyYj1KVyHtc3L4p34NjXeE= + qaZd0aWBhCQgnOc6jep1O/Q4c7S8COG/QAHXvV0aN3M= Modules/module.modulemap diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Headers/SocketIO-Swift.h b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Headers/SocketIO-Swift.h index e22a6a8..418a747 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Headers/SocketIO-Swift.h +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Headers/SocketIO-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef SOCKETIO_SWIFT_H #define SOCKETIO_SWIFT_H #pragma clang diagnostic push @@ -190,7 +190,6 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif -@import Dispatch; @import Foundation; @import ObjectiveC; #endif @@ -215,6 +214,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +@class NSNumber; /// A class that represents an emit that will request an ack that has not yet been sent. /// Call timingOut(after:callback:) to complete the emit @@ -238,20 +238,6 @@ SWIFT_CLASS("_TtC8SocketIO13OnAckCallback") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - -/// A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface. -SWIFT_CLASS("_TtC8SocketIO11SSLSecurity") -@interface SSLSecurity : NSObject -/// Creates a new SSLSecurity that specifies whether to use publicKeys or certificates should be used for SSL -/// pinning validation -/// \param usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning -/// validation -/// -- (nonnull instancetype)initWithUsePublicKeys:(BOOL)usePublicKeys; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - @class SocketRawAckView; /// A class that represents a waiting ack call. @@ -273,6 +259,7 @@ SWIFT_CLASS("_TtC8SocketIO16SocketAckEmitter") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSString; /// Represents some event that was received. SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") @@ -287,102 +274,19 @@ SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class NSHTTPCookie; -@class WebSocket; -@protocol SocketEngineClient; -enum SocketEnginePacketType : NSInteger; /// The class that handles the engine.io protocol and transports. /// See SocketEnginePollable and SocketEngineWebsocket for transport specific methods. SWIFT_CLASS("_TtC8SocketIO12SocketEngine") @interface SocketEngine : NSObject -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// When true, the engine is in the process of switching to WebSockets. -/// Do not touch this directly -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// The client for this engine. -@property (nonatomic, weak) id _Nullable client; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSData; + /// Declares that a type will be a delegate to an engine. SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") @protocol SocketEngineClient @@ -398,10 +302,14 @@ SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. +/// Called when the engine receives a ping message. Only called in socket.io >3. +- (void)engineDidReceivePing; +/// Called when the engine receives a pong message. Only called in socket.io 2. - (void)engineDidReceivePong; -/// Called when the engine sends a ping to the server. +/// Called when the engine sends a ping to the server. Only called in socket.io 2. - (void)engineDidSendPing; +/// Called when the engine sends a pong to the server. Only called in socket.io >3. +- (void)engineDidSendPong; /// Called when the engine has a message that must be parsed. /// \param msg The message that needs parsing. /// @@ -435,95 +343,6 @@ typedef SWIFT_ENUM(NSInteger, SocketEnginePacketType, open) { }; -/// Specifies a SocketEngine. -SWIFT_PROTOCOL("_TtP8SocketIO16SocketEngineSpec_") -@protocol SocketEngineSpec -/// The client for this engine. -@property (nonatomic, strong) id _Nullable client; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// When true, the engine is in the process of switching to WebSockets. -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; -@end - -@protocol SocketManagerSpec; -@class SocketRawView; -enum SocketIOStatus : NSInteger; - /// Represents a socket.io-client. /// Clients are created through a SocketManager, which owns the SocketEngineSpec that controls the connection to the server. /// For example: @@ -536,136 +355,6 @@ enum SocketIOStatus : NSInteger; /// \endcodeNOTE: The client is not thread/queue safe, all interaction with the socket should be done on the manager.handleQueue SWIFT_CLASS("_TtC8SocketIO14SocketIOClient") @interface SocketIOClient : NSObject -/// The namespace that this socket is currently connected to. -/// Must start with a /. -@property (nonatomic, readonly, copy) NSString * _Nonnull nsp; -/// The session id of this client. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The manager for this socket. -@property (nonatomic, readonly, weak) id _Nullable manager; -/// A view into this socket where emits do not check for binary data. -/// Usage: -/// \code -/// socket.rawEmitView.emit("myEvent", myObject) -/// -/// \endcodeNOTE: It is not safe to hold on to this view beyond the life of the socket. -@property (nonatomic, readonly, strong) SocketRawView * _Nonnull rawEmitView; -/// The status of this client. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Type safe way to create a new SocketIOClient. opts can be omitted. -/// \param manager The manager for this socket. -/// -/// \param nsp The namespace of the socket. -/// -- (nonnull instancetype)initWithManager:(id _Nonnull)manager nsp:(NSString * _Nonnull)nsp OBJC_DESIGNATED_INITIALIZER; -/// Connect to the server. The same as calling connect(timeoutAfter:withHandler:) with a timeout of 0. -/// Only call after adding your event listeners, unless you know what you’re doing. -- (void)connect; -/// Connect to the server. If we aren’t connected after timeoutAfter seconds, then withHandler is called. -/// Only call after adding your event listeners, unless you know what you’re doing. -/// \param timeoutAfter The number of seconds after which if we are not connected we assume the connection -/// has failed. Pass 0 to never timeout. -/// -/// \param handler The handler to call when the client fails to connect. -/// -- (void)connectWithTimeoutAfter:(double)timeoutAfter withHandler:(void (^ _Nullable)(void))handler; -/// Disconnects the socket. -/// This will cause the socket to leave the namespace it is associated to, as well as remove itself from the -/// manager. -- (void)disconnect; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items completion:(void (^ _Nullable)(void))completion; -/// Same as emitWithAck, but for Objective-C -/// NOTE: It is up to the server send an ack back, just calling this method does not mean the server will ack. -/// Check that your server’s api will ack the event being sent. -/// Example: -/// \code -/// socket.emitWithAck("myEvent", with: [1]).timingOut(after: 1) {data in -/// ... -/// } -/// -/// \endcode\param event The event to send. -/// -/// \param items The items to send with this event. Use [] to send nothing. -/// -/// -/// returns: -/// An OnAckCallback. You must call the timingOut(after:) method before the event will be sent. -- (OnAckCallback * _Nonnull)emitWithAck:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items SWIFT_WARN_UNUSED_RESULT; -/// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called. -/// \param ack The number for this ack. -/// -/// \param data The data sent back with this ack. -/// -- (void)handleAck:(NSInteger)ack data:(NSArray * _Nonnull)data; -/// Called when we get an event from socket.io. -/// \param event The name of the event. -/// -/// \param data The data that was sent with this event. -/// -/// \param isInternalMessage Whether this event was sent internally. If true it is always sent to handlers. -/// -/// \param ack If > 0 then this event expects to get an ack back from the client. -/// -- (void)handleEvent:(NSString * _Nonnull)event data:(NSArray * _Nonnull)data isInternalMessage:(BOOL)isInternalMessage withAck:(NSInteger)ack; -/// Call when you wish to leave a namespace and disconnect this socket. -- (void)leaveNamespace; -/// Joins nsp. -- (void)joinNamespace; -/// Removes handler(s) based on an event name. -/// If you wish to remove a specific event, call the off(id:) with the UUID received from its on call. -/// \param event The event to remove handlers for. -/// -- (void)off:(NSString * _Nonnull)event; -/// Removes a handler with the specified UUID gotten from an on or once -/// If you want to remove all events for an event, call the off off(_:) method with the event name. -/// \param id The UUID of the handler you wish to remove. -/// -- (void)offWithId:(NSUUID * _Nonnull)id; -/// Adds a handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)on:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a single-use handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)once:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a handler that will be called on every event. -/// \param handler The callback that will execute whenever an event is received. -/// -- (void)onAny:(void (^ _Nonnull)(SocketAnyEvent * _Nonnull))handler; -/// Tries to reconnect to the server. -- (void)reconnect SWIFT_UNAVAILABLE_MSG("Call the manager's reconnect method"); -/// Removes all handlers. -/// Can be used after disconnecting to break any potential remaining retain cycles. -- (void)removeAllHandlers; -/// Puts the socket back into the connecting state. -/// Called when the manager detects a broken connection, or when a manual reconnect is triggered. -/// \param reason The reason this socket is reconnecting. -/// -- (void)setReconnectingWithReason:(NSString * _Nonnull)reason; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -682,96 +371,7 @@ typedef SWIFT_ENUM(NSInteger, SocketIOStatus, open) { SocketIOStatusConnected = 3, }; - -/// A manager for a socket.io connection. -/// A SocketManagerSpec is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. -/// Example with SocketManager: -/// \code -/// let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!) -/// let defaultNamespaceSocket = manager.defaultSocket -/// let swiftSocket = manager.socket(forNamespace: "/swift") -/// -/// // defaultNamespaceSocket and swiftSocket both share a single connection to the server -/// -/// \endcodeSockets created through the manager are retained by the manager. So at the very least, a single strong reference -/// to the manager must be maintained to keep sockets alive. -/// To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket, -/// or call one of the disconnectSocket methods on this class. -SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") -@protocol SocketManagerSpec -/// Returns the socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this manager will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The URL of the socket.io server. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Connects the underlying transport. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; -/// Tries to reconnect to the server. -/// This will cause a disconnect event to be emitted, as well as an reconnectAttempt event. -- (void)reconnect; -/// Removes the socket from the manager’s control. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on the implementing class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; -@end - +@class NSURL; /// A manager for a socket.io connection. /// A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. @@ -789,33 +389,7 @@ SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") /// or call one of the disconnectSocket methods on this class. /// NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue SWIFT_CLASS("_TtC8SocketIO13SocketManager") -@interface SocketManager : NSObject -/// The socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The URL of the socket.io server. -/// If changed after calling init, forceNew must be set to true, or it will only connect to the url set in the -/// init. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -/// This should be a serial queue! Concurrent queues are not supported and might cause crashes and races. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this client will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; +@interface SocketManager : NSObject /// Not so type safe way to create a SocketIOClient, meant for Objective-C compatiblity. /// If using Swift it’s recommended to use init(socketURL: NSURL, options: Set) /// \param socketURL The url of the socket.io server. @@ -823,38 +397,6 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param config The config for this socket. /// - (nonnull instancetype)initWithSocketURL:(NSURL * _Nonnull)socketURL config:(NSDictionary * _Nullable)config; -/// Connects the underlying transport and the default namespace socket. -/// Override if you wish to attach a custom SocketEngineSpec. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// Same as emitAll(_:_:), but meant for Objective-C. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; /// Called when the engine closes. /// \param reason The reason that the engine closed. /// @@ -867,10 +409,14 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. -- (void)engineDidReceivePong; +/// Called when the engine receives a ping message. +- (void)engineDidReceivePing; /// Called when the sends a ping to the server. - (void)engineDidSendPing; +/// Called when the engine receives a pong message. +- (void)engineDidReceivePong; +/// Called when the sends a pong to the server. +- (void)engineDidSendPong; /// Called when when upgrading the http connection to a websocket connection. /// \param headers The http headers. /// @@ -883,36 +429,11 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param data The data the engine received. /// - (void)parseEngineBinaryData:(NSData * _Nonnull)data; -/// Tries to reconnect to the server. -/// This will cause a SocketClientEvent.reconnect event to be emitted, as well as -/// SocketClientEvent.reconnectAttempt events. -- (void)reconnect; -/// Removes the socket from the manager’s control. One of the disconnect methods should be called before calling this -/// method. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on this class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - /// Class that gives a backwards compatible way to cause an emit not to recursively check for Data objects. /// Usage: /// \code @@ -972,7 +493,7 @@ SWIFT_CLASS("_TtC8SocketIO13SocketRawView") #endif #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef SOCKETIO_SWIFT_H #define SOCKETIO_SWIFT_H #pragma clang diagnostic push @@ -1162,7 +683,6 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif -@import Dispatch; @import Foundation; @import ObjectiveC; #endif @@ -1187,6 +707,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +@class NSNumber; /// A class that represents an emit that will request an ack that has not yet been sent. /// Call timingOut(after:callback:) to complete the emit @@ -1210,20 +731,6 @@ SWIFT_CLASS("_TtC8SocketIO13OnAckCallback") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - -/// A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface. -SWIFT_CLASS("_TtC8SocketIO11SSLSecurity") -@interface SSLSecurity : NSObject -/// Creates a new SSLSecurity that specifies whether to use publicKeys or certificates should be used for SSL -/// pinning validation -/// \param usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning -/// validation -/// -- (nonnull instancetype)initWithUsePublicKeys:(BOOL)usePublicKeys; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - @class SocketRawAckView; /// A class that represents a waiting ack call. @@ -1245,6 +752,7 @@ SWIFT_CLASS("_TtC8SocketIO16SocketAckEmitter") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSString; /// Represents some event that was received. SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") @@ -1259,102 +767,19 @@ SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class NSHTTPCookie; -@class WebSocket; -@protocol SocketEngineClient; -enum SocketEnginePacketType : NSInteger; /// The class that handles the engine.io protocol and transports. /// See SocketEnginePollable and SocketEngineWebsocket for transport specific methods. SWIFT_CLASS("_TtC8SocketIO12SocketEngine") @interface SocketEngine : NSObject -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// When true, the engine is in the process of switching to WebSockets. -/// Do not touch this directly -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// The client for this engine. -@property (nonatomic, weak) id _Nullable client; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSData; + /// Declares that a type will be a delegate to an engine. SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") @protocol SocketEngineClient @@ -1370,10 +795,14 @@ SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. +/// Called when the engine receives a ping message. Only called in socket.io >3. +- (void)engineDidReceivePing; +/// Called when the engine receives a pong message. Only called in socket.io 2. - (void)engineDidReceivePong; -/// Called when the engine sends a ping to the server. +/// Called when the engine sends a ping to the server. Only called in socket.io 2. - (void)engineDidSendPing; +/// Called when the engine sends a pong to the server. Only called in socket.io >3. +- (void)engineDidSendPong; /// Called when the engine has a message that must be parsed. /// \param msg The message that needs parsing. /// @@ -1407,95 +836,6 @@ typedef SWIFT_ENUM(NSInteger, SocketEnginePacketType, open) { }; -/// Specifies a SocketEngine. -SWIFT_PROTOCOL("_TtP8SocketIO16SocketEngineSpec_") -@protocol SocketEngineSpec -/// The client for this engine. -@property (nonatomic, strong) id _Nullable client; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// When true, the engine is in the process of switching to WebSockets. -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; -@end - -@protocol SocketManagerSpec; -@class SocketRawView; -enum SocketIOStatus : NSInteger; - /// Represents a socket.io-client. /// Clients are created through a SocketManager, which owns the SocketEngineSpec that controls the connection to the server. /// For example: @@ -1508,136 +848,6 @@ enum SocketIOStatus : NSInteger; /// \endcodeNOTE: The client is not thread/queue safe, all interaction with the socket should be done on the manager.handleQueue SWIFT_CLASS("_TtC8SocketIO14SocketIOClient") @interface SocketIOClient : NSObject -/// The namespace that this socket is currently connected to. -/// Must start with a /. -@property (nonatomic, readonly, copy) NSString * _Nonnull nsp; -/// The session id of this client. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The manager for this socket. -@property (nonatomic, readonly, weak) id _Nullable manager; -/// A view into this socket where emits do not check for binary data. -/// Usage: -/// \code -/// socket.rawEmitView.emit("myEvent", myObject) -/// -/// \endcodeNOTE: It is not safe to hold on to this view beyond the life of the socket. -@property (nonatomic, readonly, strong) SocketRawView * _Nonnull rawEmitView; -/// The status of this client. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Type safe way to create a new SocketIOClient. opts can be omitted. -/// \param manager The manager for this socket. -/// -/// \param nsp The namespace of the socket. -/// -- (nonnull instancetype)initWithManager:(id _Nonnull)manager nsp:(NSString * _Nonnull)nsp OBJC_DESIGNATED_INITIALIZER; -/// Connect to the server. The same as calling connect(timeoutAfter:withHandler:) with a timeout of 0. -/// Only call after adding your event listeners, unless you know what you’re doing. -- (void)connect; -/// Connect to the server. If we aren’t connected after timeoutAfter seconds, then withHandler is called. -/// Only call after adding your event listeners, unless you know what you’re doing. -/// \param timeoutAfter The number of seconds after which if we are not connected we assume the connection -/// has failed. Pass 0 to never timeout. -/// -/// \param handler The handler to call when the client fails to connect. -/// -- (void)connectWithTimeoutAfter:(double)timeoutAfter withHandler:(void (^ _Nullable)(void))handler; -/// Disconnects the socket. -/// This will cause the socket to leave the namespace it is associated to, as well as remove itself from the -/// manager. -- (void)disconnect; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items completion:(void (^ _Nullable)(void))completion; -/// Same as emitWithAck, but for Objective-C -/// NOTE: It is up to the server send an ack back, just calling this method does not mean the server will ack. -/// Check that your server’s api will ack the event being sent. -/// Example: -/// \code -/// socket.emitWithAck("myEvent", with: [1]).timingOut(after: 1) {data in -/// ... -/// } -/// -/// \endcode\param event The event to send. -/// -/// \param items The items to send with this event. Use [] to send nothing. -/// -/// -/// returns: -/// An OnAckCallback. You must call the timingOut(after:) method before the event will be sent. -- (OnAckCallback * _Nonnull)emitWithAck:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items SWIFT_WARN_UNUSED_RESULT; -/// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called. -/// \param ack The number for this ack. -/// -/// \param data The data sent back with this ack. -/// -- (void)handleAck:(NSInteger)ack data:(NSArray * _Nonnull)data; -/// Called when we get an event from socket.io. -/// \param event The name of the event. -/// -/// \param data The data that was sent with this event. -/// -/// \param isInternalMessage Whether this event was sent internally. If true it is always sent to handlers. -/// -/// \param ack If > 0 then this event expects to get an ack back from the client. -/// -- (void)handleEvent:(NSString * _Nonnull)event data:(NSArray * _Nonnull)data isInternalMessage:(BOOL)isInternalMessage withAck:(NSInteger)ack; -/// Call when you wish to leave a namespace and disconnect this socket. -- (void)leaveNamespace; -/// Joins nsp. -- (void)joinNamespace; -/// Removes handler(s) based on an event name. -/// If you wish to remove a specific event, call the off(id:) with the UUID received from its on call. -/// \param event The event to remove handlers for. -/// -- (void)off:(NSString * _Nonnull)event; -/// Removes a handler with the specified UUID gotten from an on or once -/// If you want to remove all events for an event, call the off off(_:) method with the event name. -/// \param id The UUID of the handler you wish to remove. -/// -- (void)offWithId:(NSUUID * _Nonnull)id; -/// Adds a handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)on:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a single-use handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)once:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a handler that will be called on every event. -/// \param handler The callback that will execute whenever an event is received. -/// -- (void)onAny:(void (^ _Nonnull)(SocketAnyEvent * _Nonnull))handler; -/// Tries to reconnect to the server. -- (void)reconnect SWIFT_UNAVAILABLE_MSG("Call the manager's reconnect method"); -/// Removes all handlers. -/// Can be used after disconnecting to break any potential remaining retain cycles. -- (void)removeAllHandlers; -/// Puts the socket back into the connecting state. -/// Called when the manager detects a broken connection, or when a manual reconnect is triggered. -/// \param reason The reason this socket is reconnecting. -/// -- (void)setReconnectingWithReason:(NSString * _Nonnull)reason; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -1654,96 +864,7 @@ typedef SWIFT_ENUM(NSInteger, SocketIOStatus, open) { SocketIOStatusConnected = 3, }; - -/// A manager for a socket.io connection. -/// A SocketManagerSpec is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. -/// Example with SocketManager: -/// \code -/// let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!) -/// let defaultNamespaceSocket = manager.defaultSocket -/// let swiftSocket = manager.socket(forNamespace: "/swift") -/// -/// // defaultNamespaceSocket and swiftSocket both share a single connection to the server -/// -/// \endcodeSockets created through the manager are retained by the manager. So at the very least, a single strong reference -/// to the manager must be maintained to keep sockets alive. -/// To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket, -/// or call one of the disconnectSocket methods on this class. -SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") -@protocol SocketManagerSpec -/// Returns the socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this manager will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The URL of the socket.io server. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Connects the underlying transport. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; -/// Tries to reconnect to the server. -/// This will cause a disconnect event to be emitted, as well as an reconnectAttempt event. -- (void)reconnect; -/// Removes the socket from the manager’s control. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on the implementing class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; -@end - +@class NSURL; /// A manager for a socket.io connection. /// A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. @@ -1761,33 +882,7 @@ SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") /// or call one of the disconnectSocket methods on this class. /// NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue SWIFT_CLASS("_TtC8SocketIO13SocketManager") -@interface SocketManager : NSObject -/// The socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The URL of the socket.io server. -/// If changed after calling init, forceNew must be set to true, or it will only connect to the url set in the -/// init. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -/// This should be a serial queue! Concurrent queues are not supported and might cause crashes and races. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this client will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; +@interface SocketManager : NSObject /// Not so type safe way to create a SocketIOClient, meant for Objective-C compatiblity. /// If using Swift it’s recommended to use init(socketURL: NSURL, options: Set) /// \param socketURL The url of the socket.io server. @@ -1795,38 +890,6 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param config The config for this socket. /// - (nonnull instancetype)initWithSocketURL:(NSURL * _Nonnull)socketURL config:(NSDictionary * _Nullable)config; -/// Connects the underlying transport and the default namespace socket. -/// Override if you wish to attach a custom SocketEngineSpec. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// Same as emitAll(_:_:), but meant for Objective-C. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; /// Called when the engine closes. /// \param reason The reason that the engine closed. /// @@ -1839,10 +902,14 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. -- (void)engineDidReceivePong; +/// Called when the engine receives a ping message. +- (void)engineDidReceivePing; /// Called when the sends a ping to the server. - (void)engineDidSendPing; +/// Called when the engine receives a pong message. +- (void)engineDidReceivePong; +/// Called when the sends a pong to the server. +- (void)engineDidSendPong; /// Called when when upgrading the http connection to a websocket connection. /// \param headers The http headers. /// @@ -1855,36 +922,11 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param data The data the engine received. /// - (void)parseEngineBinaryData:(NSData * _Nonnull)data; -/// Tries to reconnect to the server. -/// This will cause a SocketClientEvent.reconnect event to be emitted, as well as -/// SocketClientEvent.reconnectAttempt events. -- (void)reconnect; -/// Removes the socket from the manager’s control. One of the disconnect methods should be called before calling this -/// method. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on this class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - /// Class that gives a backwards compatible way to cause an emit not to recursively check for Data objects. /// Usage: /// \code diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Info.plist b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Info.plist index 25c394d..ad84117 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Info.plist and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Info.plist differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftdoc index 3456af1..f22d920 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftinterface index bac4704..5c471d8 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftdoc index 4bad59b..766d545 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftinterface index 7615326..32167c4 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc index 4bad59b..766d545 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface index 7615326..32167c4 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftdoc index 3456af1..f22d920 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftinterface index bac4704..5c471d8 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7-apple-ios.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftdoc index 3456af1..f22d920 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftinterface index bac4704..5c471d8 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/Modules/SocketIO.swiftmodule/armv7.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/SocketIO b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/SocketIO index e2d4d70..063c9a9 100755 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/SocketIO and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_armv7/SocketIO.framework/SocketIO differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Headers/SocketIO-Swift.h b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Headers/SocketIO-Swift.h index 770bd88..0b14f8f 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Headers/SocketIO-Swift.h +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Headers/SocketIO-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef SOCKETIO_SWIFT_H #define SOCKETIO_SWIFT_H #pragma clang diagnostic push @@ -190,7 +190,6 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif -@import Dispatch; @import Foundation; @import ObjectiveC; #endif @@ -215,6 +214,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +@class NSNumber; /// A class that represents an emit that will request an ack that has not yet been sent. /// Call timingOut(after:callback:) to complete the emit @@ -238,20 +238,6 @@ SWIFT_CLASS("_TtC8SocketIO13OnAckCallback") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - -/// A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface. -SWIFT_CLASS("_TtC8SocketIO11SSLSecurity") -@interface SSLSecurity : NSObject -/// Creates a new SSLSecurity that specifies whether to use publicKeys or certificates should be used for SSL -/// pinning validation -/// \param usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning -/// validation -/// -- (nonnull instancetype)initWithUsePublicKeys:(BOOL)usePublicKeys; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - @class SocketRawAckView; /// A class that represents a waiting ack call. @@ -273,6 +259,7 @@ SWIFT_CLASS("_TtC8SocketIO16SocketAckEmitter") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSString; /// Represents some event that was received. SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") @@ -287,102 +274,19 @@ SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class NSHTTPCookie; -@class WebSocket; -@protocol SocketEngineClient; -enum SocketEnginePacketType : NSInteger; /// The class that handles the engine.io protocol and transports. /// See SocketEnginePollable and SocketEngineWebsocket for transport specific methods. SWIFT_CLASS("_TtC8SocketIO12SocketEngine") @interface SocketEngine : NSObject -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// When true, the engine is in the process of switching to WebSockets. -/// Do not touch this directly -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// The client for this engine. -@property (nonatomic, weak) id _Nullable client; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSData; + /// Declares that a type will be a delegate to an engine. SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") @protocol SocketEngineClient @@ -398,10 +302,14 @@ SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. +/// Called when the engine receives a ping message. Only called in socket.io >3. +- (void)engineDidReceivePing; +/// Called when the engine receives a pong message. Only called in socket.io 2. - (void)engineDidReceivePong; -/// Called when the engine sends a ping to the server. +/// Called when the engine sends a ping to the server. Only called in socket.io 2. - (void)engineDidSendPing; +/// Called when the engine sends a pong to the server. Only called in socket.io >3. +- (void)engineDidSendPong; /// Called when the engine has a message that must be parsed. /// \param msg The message that needs parsing. /// @@ -435,95 +343,6 @@ typedef SWIFT_ENUM(NSInteger, SocketEnginePacketType, open) { }; -/// Specifies a SocketEngine. -SWIFT_PROTOCOL("_TtP8SocketIO16SocketEngineSpec_") -@protocol SocketEngineSpec -/// The client for this engine. -@property (nonatomic, strong) id _Nullable client; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// When true, the engine is in the process of switching to WebSockets. -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; -@end - -@protocol SocketManagerSpec; -@class SocketRawView; -enum SocketIOStatus : NSInteger; - /// Represents a socket.io-client. /// Clients are created through a SocketManager, which owns the SocketEngineSpec that controls the connection to the server. /// For example: @@ -536,136 +355,6 @@ enum SocketIOStatus : NSInteger; /// \endcodeNOTE: The client is not thread/queue safe, all interaction with the socket should be done on the manager.handleQueue SWIFT_CLASS("_TtC8SocketIO14SocketIOClient") @interface SocketIOClient : NSObject -/// The namespace that this socket is currently connected to. -/// Must start with a /. -@property (nonatomic, readonly, copy) NSString * _Nonnull nsp; -/// The session id of this client. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The manager for this socket. -@property (nonatomic, readonly, weak) id _Nullable manager; -/// A view into this socket where emits do not check for binary data. -/// Usage: -/// \code -/// socket.rawEmitView.emit("myEvent", myObject) -/// -/// \endcodeNOTE: It is not safe to hold on to this view beyond the life of the socket. -@property (nonatomic, readonly, strong) SocketRawView * _Nonnull rawEmitView; -/// The status of this client. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Type safe way to create a new SocketIOClient. opts can be omitted. -/// \param manager The manager for this socket. -/// -/// \param nsp The namespace of the socket. -/// -- (nonnull instancetype)initWithManager:(id _Nonnull)manager nsp:(NSString * _Nonnull)nsp OBJC_DESIGNATED_INITIALIZER; -/// Connect to the server. The same as calling connect(timeoutAfter:withHandler:) with a timeout of 0. -/// Only call after adding your event listeners, unless you know what you’re doing. -- (void)connect; -/// Connect to the server. If we aren’t connected after timeoutAfter seconds, then withHandler is called. -/// Only call after adding your event listeners, unless you know what you’re doing. -/// \param timeoutAfter The number of seconds after which if we are not connected we assume the connection -/// has failed. Pass 0 to never timeout. -/// -/// \param handler The handler to call when the client fails to connect. -/// -- (void)connectWithTimeoutAfter:(double)timeoutAfter withHandler:(void (^ _Nullable)(void))handler; -/// Disconnects the socket. -/// This will cause the socket to leave the namespace it is associated to, as well as remove itself from the -/// manager. -- (void)disconnect; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items completion:(void (^ _Nullable)(void))completion; -/// Same as emitWithAck, but for Objective-C -/// NOTE: It is up to the server send an ack back, just calling this method does not mean the server will ack. -/// Check that your server’s api will ack the event being sent. -/// Example: -/// \code -/// socket.emitWithAck("myEvent", with: [1]).timingOut(after: 1) {data in -/// ... -/// } -/// -/// \endcode\param event The event to send. -/// -/// \param items The items to send with this event. Use [] to send nothing. -/// -/// -/// returns: -/// An OnAckCallback. You must call the timingOut(after:) method before the event will be sent. -- (OnAckCallback * _Nonnull)emitWithAck:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items SWIFT_WARN_UNUSED_RESULT; -/// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called. -/// \param ack The number for this ack. -/// -/// \param data The data sent back with this ack. -/// -- (void)handleAck:(NSInteger)ack data:(NSArray * _Nonnull)data; -/// Called when we get an event from socket.io. -/// \param event The name of the event. -/// -/// \param data The data that was sent with this event. -/// -/// \param isInternalMessage Whether this event was sent internally. If true it is always sent to handlers. -/// -/// \param ack If > 0 then this event expects to get an ack back from the client. -/// -- (void)handleEvent:(NSString * _Nonnull)event data:(NSArray * _Nonnull)data isInternalMessage:(BOOL)isInternalMessage withAck:(NSInteger)ack; -/// Call when you wish to leave a namespace and disconnect this socket. -- (void)leaveNamespace; -/// Joins nsp. -- (void)joinNamespace; -/// Removes handler(s) based on an event name. -/// If you wish to remove a specific event, call the off(id:) with the UUID received from its on call. -/// \param event The event to remove handlers for. -/// -- (void)off:(NSString * _Nonnull)event; -/// Removes a handler with the specified UUID gotten from an on or once -/// If you want to remove all events for an event, call the off off(_:) method with the event name. -/// \param id The UUID of the handler you wish to remove. -/// -- (void)offWithId:(NSUUID * _Nonnull)id; -/// Adds a handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)on:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a single-use handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)once:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a handler that will be called on every event. -/// \param handler The callback that will execute whenever an event is received. -/// -- (void)onAny:(void (^ _Nonnull)(SocketAnyEvent * _Nonnull))handler; -/// Tries to reconnect to the server. -- (void)reconnect SWIFT_UNAVAILABLE_MSG("Call the manager's reconnect method"); -/// Removes all handlers. -/// Can be used after disconnecting to break any potential remaining retain cycles. -- (void)removeAllHandlers; -/// Puts the socket back into the connecting state. -/// Called when the manager detects a broken connection, or when a manual reconnect is triggered. -/// \param reason The reason this socket is reconnecting. -/// -- (void)setReconnectingWithReason:(NSString * _Nonnull)reason; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -682,96 +371,7 @@ typedef SWIFT_ENUM(NSInteger, SocketIOStatus, open) { SocketIOStatusConnected = 3, }; - -/// A manager for a socket.io connection. -/// A SocketManagerSpec is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. -/// Example with SocketManager: -/// \code -/// let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!) -/// let defaultNamespaceSocket = manager.defaultSocket -/// let swiftSocket = manager.socket(forNamespace: "/swift") -/// -/// // defaultNamespaceSocket and swiftSocket both share a single connection to the server -/// -/// \endcodeSockets created through the manager are retained by the manager. So at the very least, a single strong reference -/// to the manager must be maintained to keep sockets alive. -/// To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket, -/// or call one of the disconnectSocket methods on this class. -SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") -@protocol SocketManagerSpec -/// Returns the socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this manager will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The URL of the socket.io server. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Connects the underlying transport. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; -/// Tries to reconnect to the server. -/// This will cause a disconnect event to be emitted, as well as an reconnectAttempt event. -- (void)reconnect; -/// Removes the socket from the manager’s control. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on the implementing class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; -@end - +@class NSURL; /// A manager for a socket.io connection. /// A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. @@ -789,33 +389,7 @@ SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") /// or call one of the disconnectSocket methods on this class. /// NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue SWIFT_CLASS("_TtC8SocketIO13SocketManager") -@interface SocketManager : NSObject -/// The socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The URL of the socket.io server. -/// If changed after calling init, forceNew must be set to true, or it will only connect to the url set in the -/// init. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -/// This should be a serial queue! Concurrent queues are not supported and might cause crashes and races. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this client will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; +@interface SocketManager : NSObject /// Not so type safe way to create a SocketIOClient, meant for Objective-C compatiblity. /// If using Swift it’s recommended to use init(socketURL: NSURL, options: Set) /// \param socketURL The url of the socket.io server. @@ -823,38 +397,6 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param config The config for this socket. /// - (nonnull instancetype)initWithSocketURL:(NSURL * _Nonnull)socketURL config:(NSDictionary * _Nullable)config; -/// Connects the underlying transport and the default namespace socket. -/// Override if you wish to attach a custom SocketEngineSpec. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// Same as emitAll(_:_:), but meant for Objective-C. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; /// Called when the engine closes. /// \param reason The reason that the engine closed. /// @@ -867,10 +409,14 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. -- (void)engineDidReceivePong; +/// Called when the engine receives a ping message. +- (void)engineDidReceivePing; /// Called when the sends a ping to the server. - (void)engineDidSendPing; +/// Called when the engine receives a pong message. +- (void)engineDidReceivePong; +/// Called when the sends a pong to the server. +- (void)engineDidSendPong; /// Called when when upgrading the http connection to a websocket connection. /// \param headers The http headers. /// @@ -883,36 +429,11 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param data The data the engine received. /// - (void)parseEngineBinaryData:(NSData * _Nonnull)data; -/// Tries to reconnect to the server. -/// This will cause a SocketClientEvent.reconnect event to be emitted, as well as -/// SocketClientEvent.reconnectAttempt events. -- (void)reconnect; -/// Removes the socket from the manager’s control. One of the disconnect methods should be called before calling this -/// method. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on this class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - /// Class that gives a backwards compatible way to cause an emit not to recursively check for Data objects. /// Usage: /// \code @@ -972,7 +493,7 @@ SWIFT_CLASS("_TtC8SocketIO13SocketRawView") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef SOCKETIO_SWIFT_H #define SOCKETIO_SWIFT_H #pragma clang diagnostic push @@ -1162,7 +683,6 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif -@import Dispatch; @import Foundation; @import ObjectiveC; #endif @@ -1187,6 +707,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +@class NSNumber; /// A class that represents an emit that will request an ack that has not yet been sent. /// Call timingOut(after:callback:) to complete the emit @@ -1210,20 +731,6 @@ SWIFT_CLASS("_TtC8SocketIO13OnAckCallback") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - -/// A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface. -SWIFT_CLASS("_TtC8SocketIO11SSLSecurity") -@interface SSLSecurity : NSObject -/// Creates a new SSLSecurity that specifies whether to use publicKeys or certificates should be used for SSL -/// pinning validation -/// \param usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning -/// validation -/// -- (nonnull instancetype)initWithUsePublicKeys:(BOOL)usePublicKeys; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - @class SocketRawAckView; /// A class that represents a waiting ack call. @@ -1245,6 +752,7 @@ SWIFT_CLASS("_TtC8SocketIO16SocketAckEmitter") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSString; /// Represents some event that was received. SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") @@ -1259,102 +767,19 @@ SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class NSHTTPCookie; -@class WebSocket; -@protocol SocketEngineClient; -enum SocketEnginePacketType : NSInteger; /// The class that handles the engine.io protocol and transports. /// See SocketEnginePollable and SocketEngineWebsocket for transport specific methods. SWIFT_CLASS("_TtC8SocketIO12SocketEngine") @interface SocketEngine : NSObject -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// When true, the engine is in the process of switching to WebSockets. -/// Do not touch this directly -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// The client for this engine. -@property (nonatomic, weak) id _Nullable client; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSData; + /// Declares that a type will be a delegate to an engine. SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") @protocol SocketEngineClient @@ -1370,10 +795,14 @@ SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. +/// Called when the engine receives a ping message. Only called in socket.io >3. +- (void)engineDidReceivePing; +/// Called when the engine receives a pong message. Only called in socket.io 2. - (void)engineDidReceivePong; -/// Called when the engine sends a ping to the server. +/// Called when the engine sends a ping to the server. Only called in socket.io 2. - (void)engineDidSendPing; +/// Called when the engine sends a pong to the server. Only called in socket.io >3. +- (void)engineDidSendPong; /// Called when the engine has a message that must be parsed. /// \param msg The message that needs parsing. /// @@ -1407,95 +836,6 @@ typedef SWIFT_ENUM(NSInteger, SocketEnginePacketType, open) { }; -/// Specifies a SocketEngine. -SWIFT_PROTOCOL("_TtP8SocketIO16SocketEngineSpec_") -@protocol SocketEngineSpec -/// The client for this engine. -@property (nonatomic, strong) id _Nullable client; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// When true, the engine is in the process of switching to WebSockets. -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; -@end - -@protocol SocketManagerSpec; -@class SocketRawView; -enum SocketIOStatus : NSInteger; - /// Represents a socket.io-client. /// Clients are created through a SocketManager, which owns the SocketEngineSpec that controls the connection to the server. /// For example: @@ -1508,136 +848,6 @@ enum SocketIOStatus : NSInteger; /// \endcodeNOTE: The client is not thread/queue safe, all interaction with the socket should be done on the manager.handleQueue SWIFT_CLASS("_TtC8SocketIO14SocketIOClient") @interface SocketIOClient : NSObject -/// The namespace that this socket is currently connected to. -/// Must start with a /. -@property (nonatomic, readonly, copy) NSString * _Nonnull nsp; -/// The session id of this client. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The manager for this socket. -@property (nonatomic, readonly, weak) id _Nullable manager; -/// A view into this socket where emits do not check for binary data. -/// Usage: -/// \code -/// socket.rawEmitView.emit("myEvent", myObject) -/// -/// \endcodeNOTE: It is not safe to hold on to this view beyond the life of the socket. -@property (nonatomic, readonly, strong) SocketRawView * _Nonnull rawEmitView; -/// The status of this client. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Type safe way to create a new SocketIOClient. opts can be omitted. -/// \param manager The manager for this socket. -/// -/// \param nsp The namespace of the socket. -/// -- (nonnull instancetype)initWithManager:(id _Nonnull)manager nsp:(NSString * _Nonnull)nsp OBJC_DESIGNATED_INITIALIZER; -/// Connect to the server. The same as calling connect(timeoutAfter:withHandler:) with a timeout of 0. -/// Only call after adding your event listeners, unless you know what you’re doing. -- (void)connect; -/// Connect to the server. If we aren’t connected after timeoutAfter seconds, then withHandler is called. -/// Only call after adding your event listeners, unless you know what you’re doing. -/// \param timeoutAfter The number of seconds after which if we are not connected we assume the connection -/// has failed. Pass 0 to never timeout. -/// -/// \param handler The handler to call when the client fails to connect. -/// -- (void)connectWithTimeoutAfter:(double)timeoutAfter withHandler:(void (^ _Nullable)(void))handler; -/// Disconnects the socket. -/// This will cause the socket to leave the namespace it is associated to, as well as remove itself from the -/// manager. -- (void)disconnect; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items completion:(void (^ _Nullable)(void))completion; -/// Same as emitWithAck, but for Objective-C -/// NOTE: It is up to the server send an ack back, just calling this method does not mean the server will ack. -/// Check that your server’s api will ack the event being sent. -/// Example: -/// \code -/// socket.emitWithAck("myEvent", with: [1]).timingOut(after: 1) {data in -/// ... -/// } -/// -/// \endcode\param event The event to send. -/// -/// \param items The items to send with this event. Use [] to send nothing. -/// -/// -/// returns: -/// An OnAckCallback. You must call the timingOut(after:) method before the event will be sent. -- (OnAckCallback * _Nonnull)emitWithAck:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items SWIFT_WARN_UNUSED_RESULT; -/// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called. -/// \param ack The number for this ack. -/// -/// \param data The data sent back with this ack. -/// -- (void)handleAck:(NSInteger)ack data:(NSArray * _Nonnull)data; -/// Called when we get an event from socket.io. -/// \param event The name of the event. -/// -/// \param data The data that was sent with this event. -/// -/// \param isInternalMessage Whether this event was sent internally. If true it is always sent to handlers. -/// -/// \param ack If > 0 then this event expects to get an ack back from the client. -/// -- (void)handleEvent:(NSString * _Nonnull)event data:(NSArray * _Nonnull)data isInternalMessage:(BOOL)isInternalMessage withAck:(NSInteger)ack; -/// Call when you wish to leave a namespace and disconnect this socket. -- (void)leaveNamespace; -/// Joins nsp. -- (void)joinNamespace; -/// Removes handler(s) based on an event name. -/// If you wish to remove a specific event, call the off(id:) with the UUID received from its on call. -/// \param event The event to remove handlers for. -/// -- (void)off:(NSString * _Nonnull)event; -/// Removes a handler with the specified UUID gotten from an on or once -/// If you want to remove all events for an event, call the off off(_:) method with the event name. -/// \param id The UUID of the handler you wish to remove. -/// -- (void)offWithId:(NSUUID * _Nonnull)id; -/// Adds a handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)on:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a single-use handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)once:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a handler that will be called on every event. -/// \param handler The callback that will execute whenever an event is received. -/// -- (void)onAny:(void (^ _Nonnull)(SocketAnyEvent * _Nonnull))handler; -/// Tries to reconnect to the server. -- (void)reconnect SWIFT_UNAVAILABLE_MSG("Call the manager's reconnect method"); -/// Removes all handlers. -/// Can be used after disconnecting to break any potential remaining retain cycles. -- (void)removeAllHandlers; -/// Puts the socket back into the connecting state. -/// Called when the manager detects a broken connection, or when a manual reconnect is triggered. -/// \param reason The reason this socket is reconnecting. -/// -- (void)setReconnectingWithReason:(NSString * _Nonnull)reason; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -1654,96 +864,7 @@ typedef SWIFT_ENUM(NSInteger, SocketIOStatus, open) { SocketIOStatusConnected = 3, }; - -/// A manager for a socket.io connection. -/// A SocketManagerSpec is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. -/// Example with SocketManager: -/// \code -/// let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!) -/// let defaultNamespaceSocket = manager.defaultSocket -/// let swiftSocket = manager.socket(forNamespace: "/swift") -/// -/// // defaultNamespaceSocket and swiftSocket both share a single connection to the server -/// -/// \endcodeSockets created through the manager are retained by the manager. So at the very least, a single strong reference -/// to the manager must be maintained to keep sockets alive. -/// To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket, -/// or call one of the disconnectSocket methods on this class. -SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") -@protocol SocketManagerSpec -/// Returns the socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this manager will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The URL of the socket.io server. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Connects the underlying transport. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; -/// Tries to reconnect to the server. -/// This will cause a disconnect event to be emitted, as well as an reconnectAttempt event. -- (void)reconnect; -/// Removes the socket from the manager’s control. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on the implementing class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; -@end - +@class NSURL; /// A manager for a socket.io connection. /// A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. @@ -1761,33 +882,7 @@ SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") /// or call one of the disconnectSocket methods on this class. /// NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue SWIFT_CLASS("_TtC8SocketIO13SocketManager") -@interface SocketManager : NSObject -/// The socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The URL of the socket.io server. -/// If changed after calling init, forceNew must be set to true, or it will only connect to the url set in the -/// init. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -/// This should be a serial queue! Concurrent queues are not supported and might cause crashes and races. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this client will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; +@interface SocketManager : NSObject /// Not so type safe way to create a SocketIOClient, meant for Objective-C compatiblity. /// If using Swift it’s recommended to use init(socketURL: NSURL, options: Set) /// \param socketURL The url of the socket.io server. @@ -1795,38 +890,6 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param config The config for this socket. /// - (nonnull instancetype)initWithSocketURL:(NSURL * _Nonnull)socketURL config:(NSDictionary * _Nullable)config; -/// Connects the underlying transport and the default namespace socket. -/// Override if you wish to attach a custom SocketEngineSpec. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// Same as emitAll(_:_:), but meant for Objective-C. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; /// Called when the engine closes. /// \param reason The reason that the engine closed. /// @@ -1839,10 +902,14 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. -- (void)engineDidReceivePong; +/// Called when the engine receives a ping message. +- (void)engineDidReceivePing; /// Called when the sends a ping to the server. - (void)engineDidSendPing; +/// Called when the engine receives a pong message. +- (void)engineDidReceivePong; +/// Called when the sends a pong to the server. +- (void)engineDidSendPong; /// Called when when upgrading the http connection to a websocket connection. /// \param headers The http headers. /// @@ -1855,36 +922,11 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param data The data the engine received. /// - (void)parseEngineBinaryData:(NSData * _Nonnull)data; -/// Tries to reconnect to the server. -/// This will cause a SocketClientEvent.reconnect event to be emitted, as well as -/// SocketClientEvent.reconnectAttempt events. -- (void)reconnect; -/// Removes the socket from the manager’s control. One of the disconnect methods should be called before calling this -/// method. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on this class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - /// Class that gives a backwards compatible way to cause an emit not to recursively check for Data objects. /// Usage: /// \code @@ -1944,7 +986,7 @@ SWIFT_CLASS("_TtC8SocketIO13SocketRawView") #endif #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef SOCKETIO_SWIFT_H #define SOCKETIO_SWIFT_H #pragma clang diagnostic push @@ -2134,7 +1176,6 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif -@import Dispatch; @import Foundation; @import ObjectiveC; #endif @@ -2159,6 +1200,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); +@class NSNumber; /// A class that represents an emit that will request an ack that has not yet been sent. /// Call timingOut(after:callback:) to complete the emit @@ -2182,20 +1224,6 @@ SWIFT_CLASS("_TtC8SocketIO13OnAckCallback") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - -/// A wrapper around Starscream’s SSLSecurity that provides a minimal Objective-C interface. -SWIFT_CLASS("_TtC8SocketIO11SSLSecurity") -@interface SSLSecurity : NSObject -/// Creates a new SSLSecurity that specifies whether to use publicKeys or certificates should be used for SSL -/// pinning validation -/// \param usePublicKeys is to specific if the publicKeys or certificates should be used for SSL pinning -/// validation -/// -- (nonnull instancetype)initWithUsePublicKeys:(BOOL)usePublicKeys; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - @class SocketRawAckView; /// A class that represents a waiting ack call. @@ -2217,6 +1245,7 @@ SWIFT_CLASS("_TtC8SocketIO16SocketAckEmitter") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSString; /// Represents some event that was received. SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") @@ -2231,102 +1260,19 @@ SWIFT_CLASS("_TtC8SocketIO14SocketAnyEvent") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class NSHTTPCookie; -@class WebSocket; -@protocol SocketEngineClient; -enum SocketEnginePacketType : NSInteger; /// The class that handles the engine.io protocol and transports. /// See SocketEnginePollable and SocketEngineWebsocket for transport specific methods. SWIFT_CLASS("_TtC8SocketIO12SocketEngine") @interface SocketEngine : NSObject -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// When true, the engine is in the process of switching to WebSockets. -/// Do not touch this directly -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// The client for this engine. -@property (nonatomic, weak) id _Nullable client; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSData; + /// Declares that a type will be a delegate to an engine. SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") @protocol SocketEngineClient @@ -2342,10 +1288,14 @@ SWIFT_PROTOCOL("_TtP8SocketIO18SocketEngineClient_") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. +/// Called when the engine receives a ping message. Only called in socket.io >3. +- (void)engineDidReceivePing; +/// Called when the engine receives a pong message. Only called in socket.io 2. - (void)engineDidReceivePong; -/// Called when the engine sends a ping to the server. +/// Called when the engine sends a ping to the server. Only called in socket.io 2. - (void)engineDidSendPing; +/// Called when the engine sends a pong to the server. Only called in socket.io >3. +- (void)engineDidSendPong; /// Called when the engine has a message that must be parsed. /// \param msg The message that needs parsing. /// @@ -2379,95 +1329,6 @@ typedef SWIFT_ENUM(NSInteger, SocketEnginePacketType, open) { }; -/// Specifies a SocketEngine. -SWIFT_PROTOCOL("_TtP8SocketIO16SocketEngineSpec_") -@protocol SocketEngineSpec -/// The client for this engine. -@property (nonatomic, strong) id _Nullable client; -/// true if this engine is closed. -@property (nonatomic, readonly) BOOL closed; -/// If true the engine will attempt to use WebSocket compression. -@property (nonatomic, readonly) BOOL compress; -/// true if this engine is connected. Connected means that the initial poll connect has succeeded. -@property (nonatomic, readonly) BOOL connected; -/// The connect parameters sent during a connect. -@property (nonatomic, copy) NSDictionary * _Nullable connectParams; -/// An array of HTTPCookies that are sent during the connection. -@property (nonatomic, readonly, copy) NSArray * _Nullable cookies; -/// The queue that all engine actions take place on. -@property (nonatomic, readonly, strong) dispatch_queue_t _Nonnull engineQueue; -/// A dictionary of extra http headers that will be set during connection. -@property (nonatomic, copy) NSDictionary * _Nullable extraHeaders; -/// When true, the engine is in the process of switching to WebSockets. -@property (nonatomic, readonly) BOOL fastUpgrade; -/// When true, the engine will only use HTTP long-polling as a transport. -@property (nonatomic, readonly) BOOL forcePolling; -/// When true, the engine will only use WebSockets as a transport. -@property (nonatomic, readonly) BOOL forceWebsockets; -/// If true, the engine is currently in HTTP long-polling mode. -@property (nonatomic, readonly) BOOL polling; -/// If true, the engine is currently seeing whether it can upgrade to WebSockets. -@property (nonatomic, readonly) BOOL probing; -/// The session id for this engine. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The path to engine.io. -@property (nonatomic, readonly, copy) NSString * _Nonnull socketPath; -/// The url for polling. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlPolling; -/// The url for WebSockets. -@property (nonatomic, readonly, copy) NSURL * _Nonnull urlWebSocket; -/// If true, then the engine is currently in WebSockets mode. -@property (nonatomic, readonly) BOOL websocket SWIFT_DEPRECATED_MSG("No longer needed, if we're not polling, then we must be doing websockets"); -/// The WebSocket for this engine. -@property (nonatomic, readonly, strong) WebSocket * _Nullable ws; -/// Creates a new engine. -/// \param client The client for this engine. -/// -/// \param url The url for this engine. -/// -/// \param options The options for this engine. -/// -- (nonnull instancetype)initWithClient:(id _Nonnull)client url:(NSURL * _Nonnull)url options:(NSDictionary * _Nullable)options; -/// Starts the connection to the server. -- (void)connect; -/// Called when an error happens during execution. Causes a disconnection. -- (void)didErrorWithReason:(NSString * _Nonnull)reason; -/// Disconnects from the server. -/// \param reason The reason for the disconnection. This is communicated up to the client. -/// -- (void)disconnectWithReason:(NSString * _Nonnull)reason; -/// Called to switch from HTTP long-polling to WebSockets. After calling this method the engine will be in -/// WebSocket mode. -/// You shouldn’t call this directly -- (void)doFastUpgrade; -/// Causes any packets that were waiting for POSTing to be sent through the WebSocket. This happens because when -/// the engine is attempting to upgrade to WebSocket it does not do any POSTing. -/// You shouldn’t call this directly -- (void)flushWaitingForPostToWebSocket; -/// Parses raw binary received from engine.io. -/// \param data The data to parse. -/// -- (void)parseEngineData:(NSData * _Nonnull)data; -/// Parses a raw engine.io packet. -/// \param message The message to parse. -/// -- (void)parseEngineMessage:(NSString * _Nonnull)message; -/// Writes a message to engine.io, independent of transport. -/// \param msg The message to send. -/// -/// \param type The type of this message. -/// -/// \param data Any data that this message has. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)write:(NSString * _Nonnull)msg withType:(enum SocketEnginePacketType)type withData:(NSArray * _Nonnull)data completion:(void (^ _Nullable)(void))completion; -@end - -@protocol SocketManagerSpec; -@class SocketRawView; -enum SocketIOStatus : NSInteger; - /// Represents a socket.io-client. /// Clients are created through a SocketManager, which owns the SocketEngineSpec that controls the connection to the server. /// For example: @@ -2480,136 +1341,6 @@ enum SocketIOStatus : NSInteger; /// \endcodeNOTE: The client is not thread/queue safe, all interaction with the socket should be done on the manager.handleQueue SWIFT_CLASS("_TtC8SocketIO14SocketIOClient") @interface SocketIOClient : NSObject -/// The namespace that this socket is currently connected to. -/// Must start with a /. -@property (nonatomic, readonly, copy) NSString * _Nonnull nsp; -/// The session id of this client. -@property (nonatomic, readonly, copy) NSString * _Nonnull sid; -/// The manager for this socket. -@property (nonatomic, readonly, weak) id _Nullable manager; -/// A view into this socket where emits do not check for binary data. -/// Usage: -/// \code -/// socket.rawEmitView.emit("myEvent", myObject) -/// -/// \endcodeNOTE: It is not safe to hold on to this view beyond the life of the socket. -@property (nonatomic, readonly, strong) SocketRawView * _Nonnull rawEmitView; -/// The status of this client. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Type safe way to create a new SocketIOClient. opts can be omitted. -/// \param manager The manager for this socket. -/// -/// \param nsp The namespace of the socket. -/// -- (nonnull instancetype)initWithManager:(id _Nonnull)manager nsp:(NSString * _Nonnull)nsp OBJC_DESIGNATED_INITIALIZER; -/// Connect to the server. The same as calling connect(timeoutAfter:withHandler:) with a timeout of 0. -/// Only call after adding your event listeners, unless you know what you’re doing. -- (void)connect; -/// Connect to the server. If we aren’t connected after timeoutAfter seconds, then withHandler is called. -/// Only call after adding your event listeners, unless you know what you’re doing. -/// \param timeoutAfter The number of seconds after which if we are not connected we assume the connection -/// has failed. Pass 0 to never timeout. -/// -/// \param handler The handler to call when the client fails to connect. -/// -- (void)connectWithTimeoutAfter:(double)timeoutAfter withHandler:(void (^ _Nullable)(void))handler; -/// Disconnects the socket. -/// This will cause the socket to leave the namespace it is associated to, as well as remove itself from the -/// manager. -- (void)disconnect; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items; -/// Same as emit, but meant for Objective-C -/// \param event The event to send. -/// -/// \param items The items to send with this event. Send an empty array to send no data. -/// -/// \param completion Callback called on transport write completion. -/// -- (void)emit:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items completion:(void (^ _Nullable)(void))completion; -/// Same as emitWithAck, but for Objective-C -/// NOTE: It is up to the server send an ack back, just calling this method does not mean the server will ack. -/// Check that your server’s api will ack the event being sent. -/// Example: -/// \code -/// socket.emitWithAck("myEvent", with: [1]).timingOut(after: 1) {data in -/// ... -/// } -/// -/// \endcode\param event The event to send. -/// -/// \param items The items to send with this event. Use [] to send nothing. -/// -/// -/// returns: -/// An OnAckCallback. You must call the timingOut(after:) method before the event will be sent. -- (OnAckCallback * _Nonnull)emitWithAck:(NSString * _Nonnull)event with:(NSArray * _Nonnull)items SWIFT_WARN_UNUSED_RESULT; -/// Called when socket.io has acked one of our emits. Causes the corresponding ack callback to be called. -/// \param ack The number for this ack. -/// -/// \param data The data sent back with this ack. -/// -- (void)handleAck:(NSInteger)ack data:(NSArray * _Nonnull)data; -/// Called when we get an event from socket.io. -/// \param event The name of the event. -/// -/// \param data The data that was sent with this event. -/// -/// \param isInternalMessage Whether this event was sent internally. If true it is always sent to handlers. -/// -/// \param ack If > 0 then this event expects to get an ack back from the client. -/// -- (void)handleEvent:(NSString * _Nonnull)event data:(NSArray * _Nonnull)data isInternalMessage:(BOOL)isInternalMessage withAck:(NSInteger)ack; -/// Call when you wish to leave a namespace and disconnect this socket. -- (void)leaveNamespace; -/// Joins nsp. -- (void)joinNamespace; -/// Removes handler(s) based on an event name. -/// If you wish to remove a specific event, call the off(id:) with the UUID received from its on call. -/// \param event The event to remove handlers for. -/// -- (void)off:(NSString * _Nonnull)event; -/// Removes a handler with the specified UUID gotten from an on or once -/// If you want to remove all events for an event, call the off off(_:) method with the event name. -/// \param id The UUID of the handler you wish to remove. -/// -- (void)offWithId:(NSUUID * _Nonnull)id; -/// Adds a handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)on:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a single-use handler for an event. -/// \param event The event name for this handler. -/// -/// \param callback The callback that will execute when this event is received. -/// -/// -/// returns: -/// A unique id for the handler that can be used to remove it. -- (NSUUID * _Nonnull)once:(NSString * _Nonnull)event callback:(void (^ _Nonnull)(NSArray * _Nonnull, SocketAckEmitter * _Nonnull))callback; -/// Adds a handler that will be called on every event. -/// \param handler The callback that will execute whenever an event is received. -/// -- (void)onAny:(void (^ _Nonnull)(SocketAnyEvent * _Nonnull))handler; -/// Tries to reconnect to the server. -- (void)reconnect SWIFT_UNAVAILABLE_MSG("Call the manager's reconnect method"); -/// Removes all handlers. -/// Can be used after disconnecting to break any potential remaining retain cycles. -- (void)removeAllHandlers; -/// Puts the socket back into the connecting state. -/// Called when the manager detects a broken connection, or when a manual reconnect is triggered. -/// \param reason The reason this socket is reconnecting. -/// -- (void)setReconnectingWithReason:(NSString * _Nonnull)reason; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end @@ -2626,96 +1357,7 @@ typedef SWIFT_ENUM(NSInteger, SocketIOStatus, open) { SocketIOStatusConnected = 3, }; - -/// A manager for a socket.io connection. -/// A SocketManagerSpec is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. -/// Example with SocketManager: -/// \code -/// let manager = SocketManager(socketURL: URL(string:"http://localhost:8080/")!) -/// let defaultNamespaceSocket = manager.defaultSocket -/// let swiftSocket = manager.socket(forNamespace: "/swift") -/// -/// // defaultNamespaceSocket and swiftSocket both share a single connection to the server -/// -/// \endcodeSockets created through the manager are retained by the manager. So at the very least, a single strong reference -/// to the manager must be maintained to keep sockets alive. -/// To disconnect a socket and remove it from the manager, either call SocketIOClient.disconnect() on the socket, -/// or call one of the disconnectSocket methods on this class. -SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") -@protocol SocketManagerSpec -/// Returns the socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this manager will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The URL of the socket.io server. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; -/// Connects the underlying transport. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; -/// Tries to reconnect to the server. -/// This will cause a disconnect event to be emitted, as well as an reconnectAttempt event. -- (void)reconnect; -/// Removes the socket from the manager’s control. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on the implementing class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; -@end - +@class NSURL; /// A manager for a socket.io connection. /// A SocketManager is responsible for multiplexing multiple namespaces through a single SocketEngineSpec. @@ -2733,33 +1375,7 @@ SWIFT_PROTOCOL("_TtP8SocketIO17SocketManagerSpec_") /// or call one of the disconnectSocket methods on this class. /// NOTE: The manager is not thread/queue safe, all interaction with the manager should be done on the handleQueue SWIFT_CLASS("_TtC8SocketIO13SocketManager") -@interface SocketManager : NSObject -/// The socket associated with the default namespace (“/”). -@property (nonatomic, readonly, strong) SocketIOClient * _Nonnull defaultSocket; -/// The URL of the socket.io server. -/// If changed after calling init, forceNew must be set to true, or it will only connect to the url set in the -/// init. -@property (nonatomic, readonly, copy) NSURL * _Nonnull socketURL; -/// The engine for this manager. -@property (nonatomic, strong) id _Nullable engine; -/// If true then every time connect is called, a new engine will be created. -@property (nonatomic) BOOL forceNew; -/// The queue that all interaction with the client should occur on. This is the queue that event handlers are -/// called on. -/// This should be a serial queue! Concurrent queues are not supported and might cause crashes and races. -@property (nonatomic, strong) dispatch_queue_t _Nonnull handleQueue; -/// The sockets in this manager indexed by namespace. -@property (nonatomic, copy) NSDictionary * _Nonnull nsps; -/// If true, this client will try and reconnect on any disconnects. -@property (nonatomic) BOOL reconnects; -/// The minimum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWait; -/// The maximum number of seconds to wait before attempting to reconnect. -@property (nonatomic) NSInteger reconnectWaitMax; -/// The randomization factor for calculating reconnect jitter. -@property (nonatomic) double randomizationFactor; -/// The status of this manager. -@property (nonatomic, readonly) enum SocketIOStatus status; +@interface SocketManager : NSObject /// Not so type safe way to create a SocketIOClient, meant for Objective-C compatiblity. /// If using Swift it’s recommended to use init(socketURL: NSURL, options: Set) /// \param socketURL The url of the socket.io server. @@ -2767,38 +1383,6 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param config The config for this socket. /// - (nonnull instancetype)initWithSocketURL:(NSURL * _Nonnull)socketURL config:(NSDictionary * _Nullable)config; -/// Connects the underlying transport and the default namespace socket. -/// Override if you wish to attach a custom SocketEngineSpec. -- (void)connect; -/// Connects a socket through this manager’s engine. -/// \param socket The socket who we should connect through this manager. -/// -- (void)connectSocket:(SocketIOClient * _Nonnull)socket; -/// Called when the manager has disconnected from socket.io. -/// \param reason The reason for the disconnection. -/// -- (void)didDisconnectWithReason:(NSString * _Nonnull)reason; -/// Disconnects the manager and all associated sockets. -- (void)disconnect; -/// Disconnects the given socket. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param socket The socket to disconnect. -/// -- (void)disconnectSocket:(SocketIOClient * _Nonnull)socket; -/// Disconnects the socket associated with forNamespace. -/// This will remove the socket for the manager’s control, and make the socket instance useless and ready for -/// releasing. -/// \param nsp The namespace to disconnect from. -/// -- (void)disconnectSocketForNamespace:(NSString * _Nonnull)nsp; -/// Sends an event to the server on all namespaces in this manager. -/// Same as emitAll(_:_:), but meant for Objective-C. -/// \param event The event to send. -/// -/// \param items The data to send with this event. -/// -- (void)emitAll:(NSString * _Nonnull)event withItems:(NSArray * _Nonnull)items; /// Called when the engine closes. /// \param reason The reason that the engine closed. /// @@ -2811,10 +1395,14 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param reason The reason the engine opened. /// - (void)engineDidOpenWithReason:(NSString * _Nonnull)reason; -/// Called when the engine receives a pong message. -- (void)engineDidReceivePong; +/// Called when the engine receives a ping message. +- (void)engineDidReceivePing; /// Called when the sends a ping to the server. - (void)engineDidSendPing; +/// Called when the engine receives a pong message. +- (void)engineDidReceivePong; +/// Called when the sends a pong to the server. +- (void)engineDidSendPong; /// Called when when upgrading the http connection to a websocket connection. /// \param headers The http headers. /// @@ -2827,36 +1415,11 @@ SWIFT_CLASS("_TtC8SocketIO13SocketManager") /// \param data The data the engine received. /// - (void)parseEngineBinaryData:(NSData * _Nonnull)data; -/// Tries to reconnect to the server. -/// This will cause a SocketClientEvent.reconnect event to be emitted, as well as -/// SocketClientEvent.reconnectAttempt events. -- (void)reconnect; -/// Removes the socket from the manager’s control. One of the disconnect methods should be called before calling this -/// method. -/// After calling this method the socket should no longer be considered usable. -/// \param socket The socket to remove. -/// -/// -/// returns: -/// The socket removed, if it was owned by the manager. -- (SocketIOClient * _Nullable)removeSocket:(SocketIOClient * _Nonnull)socket; -/// Returns a SocketIOClient for the given namespace. This socket shares a transport with the manager. -/// Calling multiple times returns the same socket. -/// Sockets created from this method are retained by the manager. -/// Call one of the disconnectSocket methods on this class to remove the socket from manager control. -/// Or call SocketIOClient.disconnect() on the client. -/// \param nsp The namespace for the socket. -/// -/// -/// returns: -/// A SocketIOClient for the given namespace. -- (SocketIOClient * _Nonnull)socketForNamespace:(NSString * _Nonnull)nsp SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init SWIFT_UNAVAILABLE; + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end - /// Class that gives a backwards compatible way to cause an emit not to recursively check for Data objects. /// Usage: /// \code diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Info.plist b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Info.plist index 326400c..1e1bf6d 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Info.plist and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Info.plist differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftdoc index f744ff6..736b8dc 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 7b7c0cb..1da0301 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc index f744ff6..736b8dc 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface index 7b7c0cb..1da0301 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/arm64.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc index b882984..4a1d144 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface index 8383f09..33e5cf2 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target i386-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftdoc index b882984..4a1d144 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftinterface index 8383f09..33e5cf2 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/i386.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target i386-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 4bf5430..be5fdbf 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 9c3737a..92e7d94 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target x86_64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftdoc index 4bf5430..be5fdbf 100644 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftinterface index 9c3737a..92e7d94 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/Modules/SocketIO.swiftmodule/x86_64.swiftinterface @@ -1,131 +1,143 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target x86_64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name SocketIO import Dispatch import Foundation @_exported import SocketIO import Starscream import Swift -@objc open class SocketEngine : ObjectiveC.NSObject, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { - @objc final public let engineQueue: Dispatch.DispatchQueue - @objc public var connectParams: [Swift.String : Any]? { - @objc get - @objc set +import _Concurrency +@objc open class SocketEngine : ObjectiveC.NSObject, Starscream.WebSocketDelegate, Foundation.URLSessionDelegate, SocketIO.SocketEnginePollable, SocketIO.SocketEngineWebsocket, SocketIO.ConfigSettable { + final public let engineQueue: Dispatch.DispatchQueue + public var connectParams: [Swift.String : Any]? { + get + set } - @objc public var extraHeaders: [Swift.String : Swift.String]? + public var extraHeaders: [Swift.String : Swift.String]? public var postWait: [SocketIO.Post] public var waitingForPoll: Swift.Bool public var waitingForPost: Swift.Bool - @objc public var closed: Swift.Bool { + public var closed: Swift.Bool { get } - @objc public var compress: Swift.Bool { + public var compress: Swift.Bool { get } - @objc public var connected: Swift.Bool { + public var connected: Swift.Bool { get } - @objc public var cookies: [Foundation.HTTPCookie]? { + public var cookies: [Foundation.HTTPCookie]? { get } - @objc public var fastUpgrade: Swift.Bool { + public var fastUpgrade: Swift.Bool { get } - @objc public var forcePolling: Swift.Bool { + public var forcePolling: Swift.Bool { get } - @objc public var forceWebsockets: Swift.Bool { + public var forceWebsockets: Swift.Bool { get } public var invalidated: Swift.Bool { get } - @objc public var polling: Swift.Bool { + public var polling: Swift.Bool { get } - @objc public var probing: Swift.Bool { + public var probing: Swift.Bool { get } public var session: Foundation.URLSession? { get } - @objc public var sid: Swift.String { + public var sid: Swift.String { get } - @objc public var socketPath: Swift.String { + public var socketPath: Swift.String { get } - @objc public var urlPolling: Foundation.URL { + public var urlPolling: Foundation.URL { get } - @objc public var urlWebSocket: Foundation.URL { + public var urlWebSocket: Foundation.URL { + get + } + public var version: SocketIO.SocketIOVersion { get } @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") - @objc public var websocket: Swift.Bool { + public var websocket: Swift.Bool { get } public var enableSOCKSProxy: Swift.Bool { get } - @objc public var ws: Starscream.WebSocket? { + public var ws: Starscream.WebSocket? { + get + } + public var wsConnected: Swift.Bool { get } - @objc weak public var client: SocketIO.SocketEngineClient? + weak public var client: SocketIO.SocketEngineClient? public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, config: SocketIO.SocketIOClientConfiguration) - @objc required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + required convenience public init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func didError(reason: Swift.String) - @objc open func disconnect(reason: Swift.String) - @objc open func doFastUpgrade() - @objc open func flushWaitingForPostToWebSocket() - @objc open func parseEngineData(_ data: Foundation.Data) - @objc open func parseEngineMessage(_ message: Swift.String) + open func connect() + open func didError(reason: Swift.String) + open func disconnect(reason: Swift.String) + open func doFastUpgrade() + open func flushWaitingForPostToWebSocket() + open func parseEngineData(_ data: Foundation.Data) + open func parseEngineMessage(_ message: Swift.String) open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) - @objc override dynamic public init() + open func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())? = nil) } -extension SocketEngine { +extension SocketIO.SocketEngine { public func URLSession(session: Foundation.URLSession, didBecomeInvalidWithError error: Foundation.NSError?) } -@objc public protocol SocketEngineSpec { - @objc var client: SocketIO.SocketEngineClient? { get set } - @objc var closed: Swift.Bool { get } - @objc var compress: Swift.Bool { get } - @objc var connected: Swift.Bool { get } - @objc var connectParams: [Swift.String : Any]? { get set } - @objc var cookies: [Foundation.HTTPCookie]? { get } - @objc var engineQueue: Dispatch.DispatchQueue { get } - @objc var extraHeaders: [Swift.String : Swift.String]? { get set } - @objc var fastUpgrade: Swift.Bool { get } - @objc var forcePolling: Swift.Bool { get } - @objc var forceWebsockets: Swift.Bool { get } - @objc var polling: Swift.Bool { get } - @objc var probing: Swift.Bool { get } - @objc var sid: Swift.String { get } - @objc var socketPath: Swift.String { get } - @objc var urlPolling: Foundation.URL { get } - @objc var urlWebSocket: Foundation.URL { get } - @objc @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") +extension SocketIO.SocketEngine { + public func didReceive(event: Starscream.WebSocketEvent, client _: Starscream.WebSocket) +} +public protocol SocketEngineSpec : AnyObject { + var client: SocketIO.SocketEngineClient? { get set } + var closed: Swift.Bool { get } + var compress: Swift.Bool { get } + var connected: Swift.Bool { get } + var connectParams: [Swift.String : Any]? { get set } + var cookies: [Foundation.HTTPCookie]? { get } + var engineQueue: Dispatch.DispatchQueue { get } + var extraHeaders: [Swift.String : Swift.String]? { get set } + var fastUpgrade: Swift.Bool { get } + var forcePolling: Swift.Bool { get } + var forceWebsockets: Swift.Bool { get } + var polling: Swift.Bool { get } + var probing: Swift.Bool { get } + var sid: Swift.String { get } + var socketPath: Swift.String { get } + var urlPolling: Foundation.URL { get } + var urlWebSocket: Foundation.URL { get } + var version: SocketIO.SocketIOVersion { get } + @available(*, deprecated, message: "No longer needed, if we're not polling, then we must be doing websockets") var websocket: Swift.Bool { get } - @objc var ws: Starscream.WebSocket? { get } - @objc init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) - @objc func connect() - @objc func didError(reason: Swift.String) - @objc func disconnect(reason: Swift.String) - @objc func doFastUpgrade() - @objc func flushWaitingForPostToWebSocket() - @objc func parseEngineData(_ data: Foundation.Data) - @objc func parseEngineMessage(_ message: Swift.String) - @objc func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) + var ws: Starscream.WebSocket? { get } + init(client: SocketIO.SocketEngineClient, url: Foundation.URL, options: [Swift.String : Any]?) + func connect() + func didError(reason: Swift.String) + func disconnect(reason: Swift.String) + func doFastUpgrade() + func flushWaitingForPostToWebSocket() + func parseEngineData(_ data: Foundation.Data) + func parseEngineMessage(_ message: Swift.String) + func write(_ msg: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public protocol SocketEngineClient { @objc func engineDidError(reason: Swift.String) @objc func engineDidClose(reason: Swift.String) @objc func engineDidOpen(reason: Swift.String) + @objc func engineDidReceivePing() @objc func engineDidReceivePong() @objc func engineDidSendPing() + @objc func engineDidSendPong() @objc func parseEngineMessage(_ msg: Swift.String) @objc func parseEngineBinaryData(_ data: Foundation.Data) @objc func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @@ -140,15 +152,16 @@ public protocol SocketEnginePollable : SocketIO.SocketEngineSpec { func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) func stopPolling() } -extension SocketEnginePollable { +extension SocketIO.SocketEnginePollable { public func doPoll() public func sendPollMessage(_ message: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())? = nil) public func stopPolling() } public protocol SocketEngineWebsocket : SocketIO.SocketEngineSpec { + var wsConnected: Swift.Bool { get } func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData datas: [Foundation.Data], completion: (() -> ())?) } -extension SocketEngineWebsocket { +extension SocketIO.SocketEngineWebsocket { public func sendWebSocketMessage(_ str: Swift.String, withType type: SocketIO.SocketEnginePacketType, withData data: [Foundation.Data], completion: (() -> ())?) } @objc public enum SocketEnginePacketType : Swift.Int { @@ -159,11 +172,11 @@ extension SocketEngineWebsocket { case message case upgrade case noop + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } @objc final public class SocketAckEmitter : ObjectiveC.NSObject { @objc final public var rawEmitView: SocketIO.SocketRawAckView { @@ -176,17 +189,17 @@ extension SocketEngineWebsocket { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) @objc deinit - @objc override dynamic public init() } @objc @_hasMissingDesignatedInitializers final public class OnAckCallback : ObjectiveC.NSObject { @objc deinit @objc final public func timingOut(after seconds: Swift.Double, callback: @escaping SocketIO.AckCallback) - @objc override dynamic public init() } public enum SocketAckStatus : Swift.String { case noAck - public typealias RawValue = Swift.String + public static func == (lhs: Swift.String, rhs: SocketIO.SocketAckStatus) -> Swift.Bool + public static func == (lhs: SocketIO.SocketAckStatus, rhs: Swift.String) -> Swift.Bool public init?(rawValue: Swift.String) + public typealias RawValue = Swift.String public var rawValue: Swift.String { get } @@ -198,64 +211,61 @@ public enum SocketAckStatus : Swift.String { @objc get } @objc deinit - @objc override dynamic public init() } @objc open class SocketIOClient : ObjectiveC.NSObject, SocketIO.SocketIOClientSpec { - @objc final public let nsp: Swift.String - @objc public var sid: Swift.String { - @objc get - } + final public let nsp: Swift.String public var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } public var handlers: [SocketIO.SocketEventHandler] { get } - @objc weak public var manager: SocketIO.SocketManagerSpec? { + weak public var manager: SocketIO.SocketManagerSpec? { get } - @objc public var rawEmitView: SocketIO.SocketRawView { - @objc get + public var rawEmitView: SocketIO.SocketRawView { + get } - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var status: SocketIO.SocketIOStatus { + get } - @objc public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) + public var sid: Swift.String? { + get + } + public init(manager: SocketIO.SocketManagerSpec, nsp: Swift.String) @objc deinit - @objc open func connect() - @objc open func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - open func didConnect(toNamespace namespace: Swift.String) + open func connect(withPayload payload: [Swift.String : Any]? = nil) + open func connect(withPayload payload: [Swift.String : Any]? = nil, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + open func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) open func didDisconnect(reason: Swift.String) - @objc open func disconnect() + open func disconnect() open func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())? = nil) - @objc open func emit(_ event: Swift.String, with items: [Any]) - @objc open func emit(_ event: Swift.String, with items: [Any], completion: (() -> ())? = nil) + open func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) open func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback - @objc open func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback + open func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback open func emitAck(_ ack: Swift.Int, with items: [Any]) - @objc open func handleAck(_ ack: Swift.Int, data: [Any]) + open func handleAck(_ ack: Swift.Int, data: [Any]) open func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) - @objc open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) + open func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int = -1) open func handlePacket(_ packet: SocketIO.SocketPacket) - @objc open func leaveNamespace() - @objc open func joinNamespace() + open func leaveNamespace() + open func joinNamespace(withPayload payload: [Swift.String : Any]? = nil) open func off(clientEvent event: SocketIO.SocketClientEvent) - @objc open func off(_ event: Swift.String) - @objc open func off(id: Foundation.UUID) + open func off(_ event: Swift.String) + open func off(id: Foundation.UUID) @discardableResult - @objc open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func on(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func on(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult open func once(clientEvent event: SocketIO.SocketClientEvent, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID @discardableResult - @objc open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID - @objc open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) + open func once(_ event: Swift.String, callback: @escaping SocketIO.NormalCallback) -> Foundation.UUID + open func onAny(_ handler: @escaping (SocketIO.SocketAnyEvent) -> ()) @available(*, unavailable, message: "Call the manager's reconnect method") - @objc open func reconnect() - @objc open func removeAllHandlers() - @objc open func setReconnecting(reason: Swift.String) - @objc override dynamic public init() + open func reconnect() + open func removeAllHandlers() + open func setReconnecting(reason: Swift.String) } public struct SocketEventHandler { public let event: Swift.String @@ -263,36 +273,31 @@ public struct SocketEventHandler { public let callback: SocketIO.NormalCallback public func executeCallback(with items: [Any], withAck ack: Swift.Int, withSocket socket: SocketIO.SocketIOClient) } -@objc @_hasMissingDesignatedInitializers open class SSLSecurity : ObjectiveC.NSObject { - final public let security: Starscream.SSLSecurity - @objc convenience public init(usePublicKeys: Swift.Bool = true) - convenience public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - public func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - @objc deinit - @objc override dynamic public init() -} public protocol SocketIOClientSpec : AnyObject { var anyHandler: ((SocketIO.SocketAnyEvent) -> ())? { get } var handlers: [SocketIO.SocketEventHandler] { get } var manager: SocketIO.SocketManagerSpec? { get } var nsp: Swift.String { get } var rawEmitView: SocketIO.SocketRawView { get } + var sid: Swift.String? { get } var status: SocketIO.SocketIOStatus { get } - func connect() - func connect(timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) - func didConnect(toNamespace namespace: Swift.String) + func connect(withPayload payload: [Swift.String : Any]?) + func connect(withPayload payload: [Swift.String : Any]?, timeoutAfter: Swift.Double, withHandler handler: (() -> ())?) + func didConnect(toNamespace namespace: Swift.String, payload: [Swift.String : Any]?) func didDisconnect(reason: Swift.String) func didError(reason: Swift.String) func disconnect() func emit(_ event: Swift.String, _ items: SocketIO.SocketData..., completion: (() -> ())?) + func emit(_ event: Swift.String, with items: [SocketIO.SocketData], completion: (() -> ())?) func emitAck(_ ack: Swift.Int, with items: [Any]) func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback + func emitWithAck(_ event: Swift.String, with items: [SocketIO.SocketData]) -> SocketIO.OnAckCallback func handleAck(_ ack: Swift.Int, data: [Any]) func handleClientEvent(_ event: SocketIO.SocketClientEvent, data: [Any]) func handleEvent(_ event: Swift.String, data: [Any], isInternalMessage: Swift.Bool, withAck ack: Swift.Int) func handlePacket(_ packet: SocketIO.SocketPacket) func leaveNamespace() - func joinNamespace() + func joinNamespace(withPayload payload: [Swift.String : Any]?) func off(clientEvent event: SocketIO.SocketClientEvent) func off(_ event: Swift.String) func off(id: Foundation.UUID) @@ -304,7 +309,7 @@ public protocol SocketIOClientSpec : AnyObject { func removeAllHandlers() func setReconnecting(reason: Swift.String) } -extension SocketIOClientSpec { +extension SocketIO.SocketIOClientSpec { public func didError(reason: Swift.String) } public enum SocketClientEvent : Swift.String { @@ -317,11 +322,20 @@ public enum SocketClientEvent : Swift.String { case reconnectAttempt case statusChange case websocketUpgrade + public init?(rawValue: Swift.String) public typealias RawValue = Swift.String public var rawValue: Swift.String { get } - public init?(rawValue: Swift.String) +} +public enum SocketIOVersion : Swift.Int { + case two + case three + public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int + public var rawValue: Swift.Int { + get + } } public enum SocketIOClientOption { case compress @@ -342,9 +356,10 @@ public enum SocketIOClientOption { case reconnectWaitMax(Swift.Int) case randomizationFactor(Swift.Double) case secure(Swift.Bool) - case security(SocketIO.SSLSecurity) + case security(Starscream.CertificatePinning) case selfSigned(Swift.Bool) case sessionDelegate(Foundation.URLSessionDelegate) + case version(SocketIO.SocketIOVersion) public var description: Swift.String { get } @@ -361,11 +376,11 @@ public enum SocketIOClientOption { public var description: Swift.String { get } + public init?(rawValue: Swift.Int) public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } - public init?(rawValue: Swift.Int) } public struct SocketIOClientConfiguration : Swift.ExpressibleByArrayLiteral, Swift.Collection, Swift.MutableCollection { public typealias Element = SocketIO.SocketIOClientOption @@ -408,32 +423,32 @@ public protocol ConfigSettable { public protocol SocketData { func socketRepresentation() throws -> SocketIO.SocketData } -extension SocketData { +extension SocketIO.SocketData { public func socketRepresentation() -> SocketIO.SocketData } -extension Array : SocketIO.SocketData { +extension Swift.Array : SocketIO.SocketData { } -extension Bool : SocketIO.SocketData { +extension Swift.Bool : SocketIO.SocketData { } -extension Dictionary : SocketIO.SocketData { +extension Swift.Dictionary : SocketIO.SocketData { } -extension Double : SocketIO.SocketData { +extension Swift.Double : SocketIO.SocketData { } -extension Int : SocketIO.SocketData { +extension Swift.Int : SocketIO.SocketData { } -extension NSArray : SocketIO.SocketData { +extension Foundation.NSArray : SocketIO.SocketData { } -extension Data : SocketIO.SocketData { +extension Foundation.Data : SocketIO.SocketData { } -extension NSData : SocketIO.SocketData { +extension Foundation.NSData : SocketIO.SocketData { } -extension NSDictionary : SocketIO.SocketData { +extension Foundation.NSDictionary : SocketIO.SocketData { } -extension NSString : SocketIO.SocketData { +extension Foundation.NSString : SocketIO.SocketData { } -extension NSNull : SocketIO.SocketData { +extension Foundation.NSNull : SocketIO.SocketData { } -extension String : SocketIO.SocketData { +extension Swift.String : SocketIO.SocketData { } public typealias AckCallback = ([Any]) -> () public typealias NormalCallback = ([Any], SocketIO.SocketAckEmitter) -> () @@ -443,7 +458,7 @@ public protocol SocketLogger : AnyObject { func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } -extension SocketLogger { +extension SocketIO.SocketLogger { public func log(_ message: @autoclosure () -> Swift.String, type: Swift.String) public func error(_ message: @autoclosure () -> Swift.String, type: Swift.String) } @@ -470,7 +485,7 @@ public struct SocketPacket : Swift.CustomStringConvertible { get } } -extension SocketPacket { +extension SocketIO.SocketPacket { public enum PacketType : Swift.Int { case connect case disconnect @@ -482,8 +497,8 @@ extension SocketPacket { public var isBinary: Swift.Bool { get } - public typealias RawValue = Swift.Int public init?(rawValue: Swift.Int) + public typealias RawValue = Swift.Int public var rawValue: Swift.Int { get } @@ -498,102 +513,104 @@ public enum SocketParsableError : Swift.Error { case invalidPacket case invalidPacketType public static func == (a: SocketIO.SocketParsableError, b: SocketIO.SocketParsableError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public protocol SocketDataBufferable : AnyObject { var waitingPackets: [SocketIO.SocketPacket] { get set } } -extension SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { +extension SocketIO.SocketParsable where Self : SocketIO.SocketDataBufferable, Self : SocketIO.SocketManagerSpec { public func parseSocketMessage(_ message: Swift.String) -> SocketIO.SocketPacket? public func parseBinaryData(_ data: Foundation.Data) -> SocketIO.SocketPacket? } @objc open class SocketManager : ObjectiveC.NSObject, SocketIO.SocketManagerSpec, SocketIO.SocketParsable, SocketIO.SocketDataBufferable, SocketIO.ConfigSettable { - @objc public var defaultSocket: SocketIO.SocketIOClient { - @objc get + public var defaultSocket: SocketIO.SocketIOClient { + get } - @objc final public let socketURL: Foundation.URL + final public let socketURL: Foundation.URL public var config: SocketIO.SocketIOClientConfiguration { get set } - @objc public var engine: SocketIO.SocketEngineSpec? - @objc public var forceNew: Swift.Bool - @objc public var handleQueue: Dispatch.DispatchQueue - @objc public var nsps: [Swift.String : SocketIO.SocketIOClient] - @objc public var reconnects: Swift.Bool - @objc public var reconnectWait: Swift.Int - @objc public var reconnectWaitMax: Swift.Int - @objc public var randomizationFactor: Swift.Double - @objc public var status: SocketIO.SocketIOStatus { - @objc get + public var engine: SocketIO.SocketEngineSpec? + public var forceNew: Swift.Bool + public var handleQueue: Dispatch.DispatchQueue + public var nsps: [Swift.String : SocketIO.SocketIOClient] + public var reconnects: Swift.Bool + public var reconnectWait: Swift.Int + public var reconnectWaitMax: Swift.Int + public var randomizationFactor: Swift.Double + public var status: SocketIO.SocketIOStatus { + get + } + public var version: SocketIO.SocketIOVersion { + get } public var waitingPackets: [SocketIO.SocketPacket] public init(socketURL: Foundation.URL, config: SocketIO.SocketIOClientConfiguration = []) @objc convenience public init(socketURL: Foundation.URL, config: [Swift.String : Any]?) @objc deinit - @objc open func connect() - @objc open func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func didDisconnect(reason: Swift.String) - @objc open func disconnect() - @objc open func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc open func disconnectSocket(forNamespace nsp: Swift.String) + open func connect() + open func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload payload: [Swift.String : Any]? = nil) + open func didDisconnect(reason: Swift.String) + open func disconnect() + open func disconnectSocket(_ socket: SocketIO.SocketIOClient) + open func disconnectSocket(forNamespace nsp: Swift.String) open func emitAll(clientEvent event: SocketIO.SocketClientEvent, data: [Any]) open func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) - @objc open func emitAll(_ event: Swift.String, withItems items: [Any]) @objc open func engineDidClose(reason: Swift.String) @objc open func engineDidError(reason: Swift.String) @objc open func engineDidOpen(reason: Swift.String) - @objc open func engineDidReceivePong() + @objc open func engineDidReceivePing() @objc open func engineDidSendPing() + @objc open func engineDidReceivePong() + @objc open func engineDidSendPong() @objc open func engineDidWebsocketUpgrade(headers: [Swift.String : Swift.String]) @objc open func parseEngineMessage(_ msg: Swift.String) @objc open func parseEngineBinaryData(_ data: Foundation.Data) - @objc open func reconnect() + open func reconnect() @discardableResult - @objc open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? + open func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? open func setConfigs(_ config: SocketIO.SocketIOClientConfiguration) - @objc open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient - @objc override dynamic public init() -} -@objc public protocol SocketManagerSpec : AnyObject, SocketIO.SocketEngineClient { - @objc var defaultSocket: SocketIO.SocketIOClient { get } - @objc var engine: SocketIO.SocketEngineSpec? { get set } - @objc var forceNew: Swift.Bool { get set } - @objc var handleQueue: Dispatch.DispatchQueue { get set } - @objc var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } - @objc var reconnects: Swift.Bool { get set } - @objc var reconnectWait: Swift.Int { get set } - @objc var reconnectWaitMax: Swift.Int { get set } - @objc var randomizationFactor: Swift.Double { get set } - @objc var socketURL: Foundation.URL { get } - @objc var status: SocketIO.SocketIOStatus { get } - @objc func connect() - @objc func connectSocket(_ socket: SocketIO.SocketIOClient) - @objc func didDisconnect(reason: Swift.String) - @objc func disconnect() - @objc func disconnectSocket(_ socket: SocketIO.SocketIOClient) - @objc func disconnectSocket(forNamespace nsp: Swift.String) - @objc func emitAll(_ event: Swift.String, withItems items: [Any]) - @objc func reconnect() - @objc @discardableResult + open func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient +} +public protocol SocketManagerSpec : SocketIO.SocketEngineClient { + var defaultSocket: SocketIO.SocketIOClient { get } + var engine: SocketIO.SocketEngineSpec? { get set } + var forceNew: Swift.Bool { get set } + var handleQueue: Dispatch.DispatchQueue { get set } + var nsps: [Swift.String : SocketIO.SocketIOClient] { get set } + var reconnects: Swift.Bool { get set } + var reconnectWait: Swift.Int { get set } + var reconnectWaitMax: Swift.Int { get set } + var randomizationFactor: Swift.Double { get set } + var socketURL: Foundation.URL { get } + var status: SocketIO.SocketIOStatus { get } + var version: SocketIO.SocketIOVersion { get } + func connect() + func connectSocket(_ socket: SocketIO.SocketIOClient, withPayload: [Swift.String : Any]?) + func didDisconnect(reason: Swift.String) + func disconnect() + func disconnectSocket(_ socket: SocketIO.SocketIOClient) + func disconnectSocket(forNamespace nsp: Swift.String) + func emitAll(_ event: Swift.String, _ items: SocketIO.SocketData...) + func reconnect() + @discardableResult func removeSocket(_ socket: SocketIO.SocketIOClient) -> SocketIO.SocketIOClient? - @objc func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient + func socket(forNamespace nsp: Swift.String) -> SocketIO.SocketIOClient } @objc @_hasMissingDesignatedInitializers final public class SocketRawView : ObjectiveC.NSObject { final public func emit(_ event: Swift.String, _ items: SocketIO.SocketData...) @objc final public func emit(_ event: Swift.String, with items: [Any]) final public func emitWithAck(_ event: Swift.String, _ items: SocketIO.SocketData...) -> SocketIO.OnAckCallback @objc final public func emitWithAck(_ event: Swift.String, with items: [Any]) -> SocketIO.OnAckCallback - @objc override dynamic public init() @objc deinit } @objc @_hasMissingDesignatedInitializers final public class SocketRawAckView : ObjectiveC.NSObject { final public func with(_ items: SocketIO.SocketData...) @objc final public func with(_ items: [Any]) - @objc override dynamic public init() @objc deinit } extension SocketIO.SocketEnginePacketType : Swift.Equatable {} @@ -605,6 +622,9 @@ extension SocketIO.SocketAckStatus : Swift.RawRepresentable {} extension SocketIO.SocketClientEvent : Swift.Equatable {} extension SocketIO.SocketClientEvent : Swift.Hashable {} extension SocketIO.SocketClientEvent : Swift.RawRepresentable {} +extension SocketIO.SocketIOVersion : Swift.Equatable {} +extension SocketIO.SocketIOVersion : Swift.Hashable {} +extension SocketIO.SocketIOVersion : Swift.RawRepresentable {} extension SocketIO.SocketIOClientOption : Swift.Equatable {} extension SocketIO.SocketIOClientOption : Swift.CustomStringConvertible {} extension SocketIO.SocketIOStatus : Swift.Equatable {} diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/SocketIO b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/SocketIO index 93ca7af..31b3080 100755 Binary files a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/SocketIO and b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/SocketIO differ diff --git a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/_CodeSignature/CodeResources index 4eabf4d..d1e6d5d 100644 --- a/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/SocketIO.xcframework/ios-arm64_i386_x86_64-simulator/SocketIO.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/SocketIO-Swift.h - 3DPU5MGIU97PSv5WEwRLoRrGb7w= + RVJqFB2eq/wpg1zaMut+aMrGlbw= Headers/SocketIO.h @@ -14,79 +14,79 @@ Info.plist - 0uk+uPz3UEvvfwFDwb8N3m666k8= + B5nRc0oG+c1VOjSmsmVC/RY+lks= Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftdoc - stiozR4wo4lo4Vo/2W01JHv2q4c= + q/zDxfRoXinedKTO9KY0vFarkH8= Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface - AM13+93832p/cDFhb2S9VUJKV6g= + TW/LNBqdl86RT0Og6Da43p2EL9I= Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftmodule - zbVzbcRLqMjyaF+1lXlHJu40bhE= + y1K+4Ah+rG0pGyiJV0YnGZi+yp0= Modules/SocketIO.swiftmodule/arm64.swiftdoc - stiozR4wo4lo4Vo/2W01JHv2q4c= + q/zDxfRoXinedKTO9KY0vFarkH8= Modules/SocketIO.swiftmodule/arm64.swiftinterface - AM13+93832p/cDFhb2S9VUJKV6g= + TW/LNBqdl86RT0Og6Da43p2EL9I= Modules/SocketIO.swiftmodule/arm64.swiftmodule - zbVzbcRLqMjyaF+1lXlHJu40bhE= + y1K+4Ah+rG0pGyiJV0YnGZi+yp0= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc - G1HuhxbkXkNtpMQGATsY1Nnk10U= + 1PsUvQULmSDFw8z8tpsk4hIDlYk= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface - zJNMTV6Q39lNSdfB8tqH9BqSgq0= + WLCNoLtsgDOAgoB1I0M9X26JivI= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftmodule - c4vRpSwB8UI/SZpFFgsvWt/Z6dw= + BndQ17F4q2rnc5PSDlm0IbzsAc4= Modules/SocketIO.swiftmodule/i386.swiftdoc - G1HuhxbkXkNtpMQGATsY1Nnk10U= + 1PsUvQULmSDFw8z8tpsk4hIDlYk= Modules/SocketIO.swiftmodule/i386.swiftinterface - zJNMTV6Q39lNSdfB8tqH9BqSgq0= + WLCNoLtsgDOAgoB1I0M9X26JivI= Modules/SocketIO.swiftmodule/i386.swiftmodule - c4vRpSwB8UI/SZpFFgsvWt/Z6dw= + BndQ17F4q2rnc5PSDlm0IbzsAc4= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - 3PPy79sNY+bFUmAI6py1GkhyACA= + NMi3V4rI/rP47gUWWg9RPUgJ1CU= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - iys2UpeMsM9MWUKNTIBvB6vUe+g= + doZ9O7DxT/S9OwtxBrNr80K5bts= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - eZexOSaxE3s5z22gUf6YTlKh5bM= + 5r0xZSNFKgdkyGzzrIM9HVoRXSw= Modules/SocketIO.swiftmodule/x86_64.swiftdoc - 3PPy79sNY+bFUmAI6py1GkhyACA= + NMi3V4rI/rP47gUWWg9RPUgJ1CU= Modules/SocketIO.swiftmodule/x86_64.swiftinterface - iys2UpeMsM9MWUKNTIBvB6vUe+g= + doZ9O7DxT/S9OwtxBrNr80K5bts= Modules/SocketIO.swiftmodule/x86_64.swiftmodule - eZexOSaxE3s5z22gUf6YTlKh5bM= + 5r0xZSNFKgdkyGzzrIM9HVoRXSw= Modules/module.modulemap @@ -99,11 +99,11 @@ hash - 3DPU5MGIU97PSv5WEwRLoRrGb7w= + RVJqFB2eq/wpg1zaMut+aMrGlbw= hash2 - 9JugkhZdx0Azxu1cviC8itE+5SdwxiSmJ4Lzo1JLUyU= + ZplEPHyiQKJykTs6swrhM5oQY1bMMAcKOLRvzWRUdfc= Headers/SocketIO.h @@ -121,198 +121,198 @@ hash - stiozR4wo4lo4Vo/2W01JHv2q4c= + q/zDxfRoXinedKTO9KY0vFarkH8= hash2 - 7QoqFH4EOmABRASopaR5JMlrpTDvjI7/D5sF8enc9O8= + 00j1BT1dEFEEBkr6IIICTLBjIwJ9Q4kAwDjOxwVMe/M= Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash - AM13+93832p/cDFhb2S9VUJKV6g= + TW/LNBqdl86RT0Og6Da43p2EL9I= hash2 - WG8A8KFrdJq5rITuv8tq2NHWUwOGV8Uz8u48X7L8Fao= + DZwHDitzGNxqLN6jiVgj+G88ybgUIBha9hUyuIUr61Y= Modules/SocketIO.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash - zbVzbcRLqMjyaF+1lXlHJu40bhE= + y1K+4Ah+rG0pGyiJV0YnGZi+yp0= hash2 - lMWJGrh5HwDdo4L63vjHEm+tmDtSpD3Cw9d8bipzmaY= + 4MtwrlGWA0lcG8s1S8Pf3SzYwZPGPpSbLielcJeCkMI= Modules/SocketIO.swiftmodule/arm64.swiftdoc hash - stiozR4wo4lo4Vo/2W01JHv2q4c= + q/zDxfRoXinedKTO9KY0vFarkH8= hash2 - 7QoqFH4EOmABRASopaR5JMlrpTDvjI7/D5sF8enc9O8= + 00j1BT1dEFEEBkr6IIICTLBjIwJ9Q4kAwDjOxwVMe/M= Modules/SocketIO.swiftmodule/arm64.swiftinterface hash - AM13+93832p/cDFhb2S9VUJKV6g= + TW/LNBqdl86RT0Og6Da43p2EL9I= hash2 - WG8A8KFrdJq5rITuv8tq2NHWUwOGV8Uz8u48X7L8Fao= + DZwHDitzGNxqLN6jiVgj+G88ybgUIBha9hUyuIUr61Y= Modules/SocketIO.swiftmodule/arm64.swiftmodule hash - zbVzbcRLqMjyaF+1lXlHJu40bhE= + y1K+4Ah+rG0pGyiJV0YnGZi+yp0= hash2 - lMWJGrh5HwDdo4L63vjHEm+tmDtSpD3Cw9d8bipzmaY= + 4MtwrlGWA0lcG8s1S8Pf3SzYwZPGPpSbLielcJeCkMI= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftdoc hash - G1HuhxbkXkNtpMQGATsY1Nnk10U= + 1PsUvQULmSDFw8z8tpsk4hIDlYk= hash2 - EbwpDw00hK0vsMdk1fTJKkMvFujYkDtBOYQcXM/n2Z0= + STXNPu9Z8r02VlhodglmsJqfwbkRIGmJgmwu/61dyFI= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftinterface hash - zJNMTV6Q39lNSdfB8tqH9BqSgq0= + WLCNoLtsgDOAgoB1I0M9X26JivI= hash2 - 6eZkD+Lc/KJ1SiqlEoSP4IuciDRDAxW29tfAAiMqwH8= + 2uy7Rd8fSFId61FHXB1/VNZdcrLodUYikZgjt9CcQV8= Modules/SocketIO.swiftmodule/i386-apple-ios-simulator.swiftmodule hash - c4vRpSwB8UI/SZpFFgsvWt/Z6dw= + BndQ17F4q2rnc5PSDlm0IbzsAc4= hash2 - v0Da+2mrnhu7NNDg8u7PxCxHRiwme9FqWNqjZLso1Yc= + khaaupEUf1Kixh7+N3pBjmpvJjcgFsENlsNjrKZsL8Q= Modules/SocketIO.swiftmodule/i386.swiftdoc hash - G1HuhxbkXkNtpMQGATsY1Nnk10U= + 1PsUvQULmSDFw8z8tpsk4hIDlYk= hash2 - EbwpDw00hK0vsMdk1fTJKkMvFujYkDtBOYQcXM/n2Z0= + STXNPu9Z8r02VlhodglmsJqfwbkRIGmJgmwu/61dyFI= Modules/SocketIO.swiftmodule/i386.swiftinterface hash - zJNMTV6Q39lNSdfB8tqH9BqSgq0= + WLCNoLtsgDOAgoB1I0M9X26JivI= hash2 - 6eZkD+Lc/KJ1SiqlEoSP4IuciDRDAxW29tfAAiMqwH8= + 2uy7Rd8fSFId61FHXB1/VNZdcrLodUYikZgjt9CcQV8= Modules/SocketIO.swiftmodule/i386.swiftmodule hash - c4vRpSwB8UI/SZpFFgsvWt/Z6dw= + BndQ17F4q2rnc5PSDlm0IbzsAc4= hash2 - v0Da+2mrnhu7NNDg8u7PxCxHRiwme9FqWNqjZLso1Yc= + khaaupEUf1Kixh7+N3pBjmpvJjcgFsENlsNjrKZsL8Q= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash - 3PPy79sNY+bFUmAI6py1GkhyACA= + NMi3V4rI/rP47gUWWg9RPUgJ1CU= hash2 - 2IxIDmRywSmMURitb97UrRxxvzxWESfdkgw2UsVzHvg= + rwRjXMxoMgNQYYoNy9cjMMWO+uLiqpaMdz01p1hoYYE= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash - iys2UpeMsM9MWUKNTIBvB6vUe+g= + doZ9O7DxT/S9OwtxBrNr80K5bts= hash2 - 8voh6j4+ApnIOhnDOuVwqQcHrMfXDyvR014nge4L+Jk= + i4yUWpSU2QDUTXE/VrABBxJEgqMSGeZ08urDgZuswGc= Modules/SocketIO.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash - eZexOSaxE3s5z22gUf6YTlKh5bM= + 5r0xZSNFKgdkyGzzrIM9HVoRXSw= hash2 - GGVM4/9r6ux+ELkA2UU1pyHNedcJWXPjgvxCjXHZSDY= + TnIrgEINiQh1zxcV/S8AGUH/FiULTjCnZw53fR8S7Mg= Modules/SocketIO.swiftmodule/x86_64.swiftdoc hash - 3PPy79sNY+bFUmAI6py1GkhyACA= + NMi3V4rI/rP47gUWWg9RPUgJ1CU= hash2 - 2IxIDmRywSmMURitb97UrRxxvzxWESfdkgw2UsVzHvg= + rwRjXMxoMgNQYYoNy9cjMMWO+uLiqpaMdz01p1hoYYE= Modules/SocketIO.swiftmodule/x86_64.swiftinterface hash - iys2UpeMsM9MWUKNTIBvB6vUe+g= + doZ9O7DxT/S9OwtxBrNr80K5bts= hash2 - 8voh6j4+ApnIOhnDOuVwqQcHrMfXDyvR014nge4L+Jk= + i4yUWpSU2QDUTXE/VrABBxJEgqMSGeZ08urDgZuswGc= Modules/SocketIO.swiftmodule/x86_64.swiftmodule hash - eZexOSaxE3s5z22gUf6YTlKh5bM= + 5r0xZSNFKgdkyGzzrIM9HVoRXSw= hash2 - GGVM4/9r6ux+ELkA2UU1pyHNedcJWXPjgvxCjXHZSDY= + TnIrgEINiQh1zxcV/S8AGUH/FiULTjCnZw53fR8S7Mg= Modules/module.modulemap diff --git a/EmbeddedFrameworks/Starscream.xcframework/Info.plist b/EmbeddedFrameworks/Starscream.xcframework/Info.plist index 9e637df..1b7dc5c 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/Info.plist +++ b/EmbeddedFrameworks/Starscream.xcframework/Info.plist @@ -6,32 +6,32 @@ LibraryIdentifier - ios-arm64_armv7 + ios-arm64_i386_x86_64-simulator LibraryPath Starscream.framework SupportedArchitectures arm64 - armv7 + i386 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - ios-arm64_i386_x86_64-simulator + ios-arm64_armv7 LibraryPath Starscream.framework SupportedArchitectures arm64 - i386 - x86_64 + armv7 SupportedPlatform ios - SupportedPlatformVariant - simulator CFBundlePackageType diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Headers/Starscream-Swift.h b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Headers/Starscream-Swift.h index 741f774..2823154 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Headers/Starscream-Swift.h +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Headers/Starscream-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef STARSCREAM_SWIFT_H #define STARSCREAM_SWIFT_H #pragma clang diagnostic push @@ -211,18 +211,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @class NSStream; -SWIFT_CLASS("_TtC10Starscream16FoundationStream") -@interface FoundationStream : NSObject -/// Delegate for the stream methods. Processes incoming bytes +SWIFT_CLASS("_TtC10Starscream19FoundationTransport") +@interface FoundationTransport : NSObject - (void)stream:(NSStream * _Nonnull)aStream handleEvent:(NSStreamEvent)eventCode; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSURLSession; +@class NSURLSessionWebSocketTask; +@class NSString; +@class NSData; -SWIFT_CLASS("_TtC10Starscream9WebSocket") -@interface WebSocket : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +SWIFT_CLASS("_TtC10Starscream12NativeEngine") SWIFT_AVAILABILITY(tvos,introduced=13.0) SWIFT_AVAILABILITY(watchos,introduced=6.0) SWIFT_AVAILABILITY(ios,introduced=13.0) SWIFT_AVAILABILITY(macos,introduced=10.15) +@interface NativeEngine : NSObject +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didOpenWithProtocol:(NSString * _Nullable)protocol; +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData * _Nullable)reason; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #if __has_attribute(external_source_symbol) @@ -232,7 +237,7 @@ SWIFT_CLASS("_TtC10Starscream9WebSocket") #endif #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef STARSCREAM_SWIFT_H #define STARSCREAM_SWIFT_H #pragma clang diagnostic push @@ -443,18 +448,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @class NSStream; -SWIFT_CLASS("_TtC10Starscream16FoundationStream") -@interface FoundationStream : NSObject -/// Delegate for the stream methods. Processes incoming bytes +SWIFT_CLASS("_TtC10Starscream19FoundationTransport") +@interface FoundationTransport : NSObject - (void)stream:(NSStream * _Nonnull)aStream handleEvent:(NSStreamEvent)eventCode; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSURLSession; +@class NSURLSessionWebSocketTask; +@class NSString; +@class NSData; -SWIFT_CLASS("_TtC10Starscream9WebSocket") -@interface WebSocket : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +SWIFT_CLASS("_TtC10Starscream12NativeEngine") SWIFT_AVAILABILITY(tvos,introduced=13.0) SWIFT_AVAILABILITY(watchos,introduced=6.0) SWIFT_AVAILABILITY(ios,introduced=13.0) SWIFT_AVAILABILITY(macos,introduced=10.15) +@interface NativeEngine : NSObject +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didOpenWithProtocol:(NSString * _Nullable)protocol; +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData * _Nullable)reason; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #if __has_attribute(external_source_symbol) diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Info.plist b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Info.plist index d6f0b8f..da48d1f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Info.plist and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Info.plist differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftdoc index e5a5407..9d8a25f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftinterface index dc3665c..2718b85 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftdoc index d0e5438..e98ff08 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftinterface index 92998b3..2804671 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc index d0e5438..e98ff08 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface index 92998b3..2804671 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftdoc index e5a5407..9d8a25f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftinterface index dc3665c..2718b85 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7-apple-ios.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftdoc index e5a5407..9d8a25f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftinterface index dc3665c..2718b85 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Modules/Starscream.swiftmodule/armv7.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios8.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Starscream b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Starscream index 407fbb4..5b58601 100755 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Starscream and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_armv7/Starscream.framework/Starscream differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Headers/Starscream-Swift.h b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Headers/Starscream-Swift.h index 56026c3..4ea5c98 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Headers/Starscream-Swift.h +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Headers/Starscream-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef STARSCREAM_SWIFT_H #define STARSCREAM_SWIFT_H #pragma clang diagnostic push @@ -211,18 +211,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @class NSStream; -SWIFT_CLASS("_TtC10Starscream16FoundationStream") -@interface FoundationStream : NSObject -/// Delegate for the stream methods. Processes incoming bytes +SWIFT_CLASS("_TtC10Starscream19FoundationTransport") +@interface FoundationTransport : NSObject - (void)stream:(NSStream * _Nonnull)aStream handleEvent:(NSStreamEvent)eventCode; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSURLSession; +@class NSURLSessionWebSocketTask; +@class NSString; +@class NSData; -SWIFT_CLASS("_TtC10Starscream9WebSocket") -@interface WebSocket : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +SWIFT_CLASS("_TtC10Starscream12NativeEngine") SWIFT_AVAILABILITY(tvos,introduced=13.0) SWIFT_AVAILABILITY(watchos,introduced=6.0) SWIFT_AVAILABILITY(ios,introduced=13.0) SWIFT_AVAILABILITY(macos,introduced=10.15) +@interface NativeEngine : NSObject +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didOpenWithProtocol:(NSString * _Nullable)protocol; +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData * _Nullable)reason; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #if __has_attribute(external_source_symbol) @@ -232,7 +237,7 @@ SWIFT_CLASS("_TtC10Starscream9WebSocket") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef STARSCREAM_SWIFT_H #define STARSCREAM_SWIFT_H #pragma clang diagnostic push @@ -443,18 +448,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @class NSStream; -SWIFT_CLASS("_TtC10Starscream16FoundationStream") -@interface FoundationStream : NSObject -/// Delegate for the stream methods. Processes incoming bytes +SWIFT_CLASS("_TtC10Starscream19FoundationTransport") +@interface FoundationTransport : NSObject - (void)stream:(NSStream * _Nonnull)aStream handleEvent:(NSStreamEvent)eventCode; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSURLSession; +@class NSURLSessionWebSocketTask; +@class NSString; +@class NSData; -SWIFT_CLASS("_TtC10Starscream9WebSocket") -@interface WebSocket : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +SWIFT_CLASS("_TtC10Starscream12NativeEngine") SWIFT_AVAILABILITY(tvos,introduced=13.0) SWIFT_AVAILABILITY(watchos,introduced=6.0) SWIFT_AVAILABILITY(ios,introduced=13.0) SWIFT_AVAILABILITY(macos,introduced=10.15) +@interface NativeEngine : NSObject +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didOpenWithProtocol:(NSString * _Nullable)protocol; +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData * _Nullable)reason; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #if __has_attribute(external_source_symbol) @@ -464,7 +474,7 @@ SWIFT_CLASS("_TtC10Starscream9WebSocket") #endif #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) +// Generated by Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) #ifndef STARSCREAM_SWIFT_H #define STARSCREAM_SWIFT_H #pragma clang diagnostic push @@ -675,18 +685,23 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @class NSStream; -SWIFT_CLASS("_TtC10Starscream16FoundationStream") -@interface FoundationStream : NSObject -/// Delegate for the stream methods. Processes incoming bytes +SWIFT_CLASS("_TtC10Starscream19FoundationTransport") +@interface FoundationTransport : NSObject - (void)stream:(NSStream * _Nonnull)aStream handleEvent:(NSStreamEvent)eventCode; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end +@class NSURLSession; +@class NSURLSessionWebSocketTask; +@class NSString; +@class NSData; -SWIFT_CLASS("_TtC10Starscream9WebSocket") -@interface WebSocket : NSObject -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +SWIFT_CLASS("_TtC10Starscream12NativeEngine") SWIFT_AVAILABILITY(tvos,introduced=13.0) SWIFT_AVAILABILITY(watchos,introduced=6.0) SWIFT_AVAILABILITY(ios,introduced=13.0) SWIFT_AVAILABILITY(macos,introduced=10.15) +@interface NativeEngine : NSObject +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didOpenWithProtocol:(NSString * _Nullable)protocol; +- (void)URLSession:(NSURLSession * _Nonnull)session webSocketTask:(NSURLSessionWebSocketTask * _Nonnull)webSocketTask didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData * _Nullable)reason; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #if __has_attribute(external_source_symbol) diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Info.plist b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Info.plist index 9841c2a..282e040 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Info.plist and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Info.plist differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 35d4c54..e9e3823 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 010aa0e..f64e350 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc index 35d4c54..e9e3823 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface index 010aa0e..f64e350 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/arm64.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target arm64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc index 522ce68..766174d 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface index 9592ed1..a16359c 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target i386-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftdoc index 522ce68..766174d 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftinterface index 9592ed1..a16359c 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/i386.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target i386-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index f1830c5..60ad23f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index c90f098..719894e 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target x86_64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftdoc index f1830c5..60ad23f 100644 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftinterface index c90f098..719894e 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Modules/Starscream.swiftmodule/x86_64.swiftinterface @@ -1,219 +1,434 @@ // swift-interface-format-version: 1.0 -// swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios8.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream +// swift-compiler-version: Apple Swift version 5.5.2 (swiftlang-1300.0.47.5 clang-1300.0.29.30) +// swift-module-flags: -target x86_64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name Starscream import CommonCrypto -import CoreFoundation import Foundation -import Security +import Network @_exported import Starscream import Swift +import _Concurrency import zlib -public let WebsocketDidConnectNotification: Swift.String -public let WebsocketDidDisconnectNotification: Swift.String -public let WebsocketDisconnectionErrorKeyName: Swift.String -public enum CloseCode : Swift.UInt16 { - case normal - case goingAway - case protocolError - case protocolUnhandledType - case noStatusReceived - case encoding - case policyViolated - case messageTooBig - public typealias RawValue = Swift.UInt16 +public enum HTTPUpgradeError : Swift.Error { + case notAnUpgrade(Swift.Int) + case invalidData +} +public struct HTTPWSHeader { + public static func createUpgrade(request: Foundation.URLRequest, supportsCompression: Swift.Bool, secKeyValue: Swift.String) -> Foundation.URLRequest + public static func generateWebSocketKey() -> Swift.String +} +public enum HTTPEvent { + case success([Swift.String : Swift.String]) + case failure(Swift.Error) +} +public protocol HTTPHandlerDelegate : AnyObject { + func didReceiveHTTP(event: Starscream.HTTPEvent) +} +public protocol HTTPHandler { + func register(delegate: Starscream.HTTPHandlerDelegate) + func convert(request: Foundation.URLRequest) -> Foundation.Data + func parse(data: Foundation.Data) -> Swift.Int +} +public protocol HTTPServerDelegate : AnyObject { + func didReceive(event: Starscream.HTTPEvent) +} +public protocol HTTPServerHandler { + func register(delegate: Starscream.HTTPServerDelegate) + func parse(data: Foundation.Data) + func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data +} +public struct URLParts { +} +extension Foundation.URL { + public var isTLSScheme: Swift.Bool { + get + } + public func getParts() -> Starscream.URLParts? +} +public protocol FrameCollectorDelegate : AnyObject { + func didForm(event: Starscream.FrameCollector.Event) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? +} +@_hasMissingDesignatedInitializers public class FrameCollector { + public enum Event { + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) + case closed(Swift.String, Swift.UInt16) + } + public func add(frame: Starscream.Frame) + @objc deinit +} +public enum SecurityErrorCode : Swift.UInt16 { + case acceptFailed + case pinningFailed public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 public var rawValue: Swift.UInt16 { get } } +public enum PinningState { + case success + case failed(CoreFoundation.CFError?) +} +public protocol CertificatePinning : AnyObject { + func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +public protocol HeaderValidator : AnyObject { + func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum TCPTransportError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.TCPTransportError, b: Starscream.TCPTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class TCPTransport : Starscream.Transport { + public var usingTLS: Swift.Bool { + get + } + public init(connection: Network.NWConnection) + public init() + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc deinit +} +public enum FoundationSecurityError : Swift.Error { + case invalidRequest + public static func == (a: Starscream.FoundationSecurityError, b: Starscream.FoundationSecurityError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +public class FoundationSecurity { + public init(allowSelfSigned: Swift.Bool = false) + @objc deinit +} +extension Starscream.FoundationSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: ((Starscream.PinningState) -> ())) +} +extension Starscream.FoundationSecurity : Starscream.HeaderValidator { + public func validate(headers: [Swift.String : Swift.String], key: Swift.String) -> Swift.Error? +} +public enum FoundationTransportError : Swift.Error { + case invalidRequest + case invalidOutputStream + case timeout + public static func == (a: Starscream.FoundationTransportError, b: Starscream.FoundationTransportError) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) + public var hashValue: Swift.Int { + get + } +} +@objc public class FoundationTransport : ObjectiveC.NSObject, Starscream.Transport, Foundation.StreamDelegate { + public var usingTLS: Swift.Bool { + get + } + public init(streamConfiguration: ((Foundation.InputStream, Foundation.OutputStream) -> Swift.Void)? = nil) + @objc deinit + public func connect(url: Foundation.URL, timeout: Swift.Double = 10, certificatePinning: Starscream.CertificatePinning? = nil) + public func disconnect() + public func register(delegate: Starscream.TransportEventClient) + public func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) +} public enum ErrorType : Swift.Error { - case outputStreamWriteError case compressionError - case invalidSSLError - case writeTimeoutError + case securityError case protocolError - case upgradeError - case closeError + case serverError public static func == (a: Starscream.ErrorType, b: Starscream.ErrorType) -> Swift.Bool + public func hash(into hasher: inout Swift.Hasher) public var hashValue: Swift.Int { get } - public func hash(into hasher: inout Swift.Hasher) } public struct WSError : Swift.Error { public let type: Starscream.ErrorType public let message: Swift.String - public let code: Swift.Int + public let code: Swift.UInt16 + public init(type: Starscream.ErrorType, message: Swift.String, code: Swift.UInt16) } public protocol WebSocketClient : AnyObject { - var delegate: Starscream.WebSocketDelegate? { get set } - var pongDelegate: Starscream.WebSocketPongDelegate? { get set } - var disableSSLCertValidation: Swift.Bool { get set } - var overrideTrustHostname: Swift.Bool { get set } - var desiredTrustHostname: Swift.String? { get set } - var sslClientCertificate: Starscream.SSLClientCertificate? { get set } - var security: Starscream.SSLTrustValidator? { get set } - var enabledSSLCipherSuites: [Security.SSLCipherSuite]? { get set } - var isConnected: Swift.Bool { get } func connect() - func disconnect(forceTimeout: Foundation.TimeInterval?, closeCode: Swift.UInt16) + func disconnect(closeCode: Swift.UInt16) func write(string: Swift.String, completion: (() -> ())?) + func write(stringData: Foundation.Data, completion: (() -> ())?) func write(data: Foundation.Data, completion: (() -> ())?) func write(ping: Foundation.Data, completion: (() -> ())?) func write(pong: Foundation.Data, completion: (() -> ())?) } -extension WebSocketClient { +extension Starscream.WebSocketClient { public func write(string: Swift.String) public func write(data: Foundation.Data) public func write(ping: Foundation.Data) public func write(pong: Foundation.Data) public func disconnect() } -public struct SSLSettings { - public let useSSL: Swift.Bool - public let disableCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public let sslClientCertificate: Starscream.SSLClientCertificate? - public let cipherSuites: [Security.SSLCipherSuite]? -} -public protocol WSStreamDelegate : AnyObject { - func newBytesInStream() - func streamDidError(error: Swift.Error?) -} -public protocol WSStream { - var delegate: Starscream.WSStreamDelegate? { get set } - func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - func write(data: Foundation.Data) -> Swift.Int - func read() -> Foundation.Data? - func cleanup() - func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) -} -@objc @_inheritsConvenienceInitializers open class FoundationStream : ObjectiveC.NSObject, Starscream.WSStream, Foundation.StreamDelegate { - weak public var delegate: Starscream.WSStreamDelegate? - public var enableSOCKSProxy: Swift.Bool - public func connect(url: Foundation.URL, port: Swift.Int, timeout: Foundation.TimeInterval, ssl: Starscream.SSLSettings, completion: @escaping ((Swift.Error?) -> Swift.Void)) - public func write(data: Foundation.Data) -> Swift.Int - public func read() -> Foundation.Data? - public func cleanup() - public func sslTrust() -> (trust: Security.SecTrust?, domain: Swift.String?) - @objc open func stream(_ aStream: Foundation.Stream, handle eventCode: Foundation.Stream.Event) - @objc deinit - @objc override dynamic public init() +public enum WebSocketEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error?) + case viabilityChanged(Swift.Bool) + case reconnectSuggested(Swift.Bool) + case cancelled } public protocol WebSocketDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocketClient) - func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: Swift.String) - func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Foundation.Data) -} -public protocol WebSocketPongDelegate : AnyObject { - func websocketDidReceivePong(socket: Starscream.WebSocketClient, data: Foundation.Data?) -} -public protocol WebSocketAdvancedDelegate : AnyObject { - func websocketDidConnect(socket: Starscream.WebSocket) - func websocketDidDisconnect(socket: Starscream.WebSocket, error: Swift.Error?) - func websocketDidReceiveMessage(socket: Starscream.WebSocket, text: Swift.String, response: Starscream.WebSocket.WSResponse) - func websocketDidReceiveData(socket: Starscream.WebSocket, data: Foundation.Data, response: Starscream.WebSocket.WSResponse) - func websocketHttpUpgrade(socket: Starscream.WebSocket, request: Swift.String) - func websocketHttpUpgrade(socket: Starscream.WebSocket, response: Swift.String) -} -@objc open class WebSocket : ObjectiveC.NSObject, Foundation.StreamDelegate, Starscream.WebSocketClient, Starscream.WSStreamDelegate { - public enum OpCode : Swift.UInt8 { - case continueFrame - case textFrame - case binaryFrame - case connectionClose - case ping - case pong - public typealias RawValue = Swift.UInt8 - public init?(rawValue: Swift.UInt8) - public var rawValue: Swift.UInt8 { - get - } - } - public static let ErrorDomain: Swift.String + func didReceive(event: Starscream.WebSocketEvent, client: Starscream.WebSocket) +} +open class WebSocket : Starscream.WebSocketClient, Starscream.EngineDelegate { + weak public var delegate: Starscream.WebSocketDelegate? + public var onEvent: ((Starscream.WebSocketEvent) -> Swift.Void)? + public var request: Foundation.URLRequest public var callbackQueue: Dispatch.DispatchQueue - @_hasMissingDesignatedInitializers public class WSResponse { - public var code: Starscream.WebSocket.OpCode - public var frameCount: Swift.Int - public var buffer: Foundation.NSMutableData? - final public let firstFrame: Foundation.Date - @objc deinit + public var respondToPingWithPong: Swift.Bool { + get + set } - weak public var delegate: Starscream.WebSocketDelegate? - weak public var advancedDelegate: Starscream.WebSocketAdvancedDelegate? - weak public var pongDelegate: Starscream.WebSocketPongDelegate? - public var onConnect: (() -> Swift.Void)? - public var onDisconnect: ((Swift.Error?) -> Swift.Void)? - public var onText: ((Swift.String) -> Swift.Void)? - public var onData: ((Foundation.Data) -> Swift.Void)? - public var onPong: ((Foundation.Data?) -> Swift.Void)? - public var onHttpResponseHeaders: (([Swift.String : Swift.String]) -> Swift.Void)? - public var disableSSLCertValidation: Swift.Bool - public var overrideTrustHostname: Swift.Bool - public var desiredTrustHostname: Swift.String? - public var sslClientCertificate: Starscream.SSLClientCertificate? - public var enableCompression: Swift.Bool - public var security: Starscream.SSLTrustValidator? - public var enabledSSLCipherSuites: [Security.SSLCipherSuite]? - public var isConnected: Swift.Bool { + public init(request: Foundation.URLRequest, engine: Starscream.Engine) + convenience public init(request: Foundation.URLRequest, certPinner: Starscream.CertificatePinning? = FoundationSecurity(), compressionHandler: Starscream.CompressionHandler? = nil, useCustomEngine: Swift.Bool = true) + public func connect() + public func disconnect(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceDisconnect() + public func write(data: Foundation.Data, completion: (() -> ())?) + public func write(string: Swift.String, completion: (() -> ())?) + public func write(stringData: Foundation.Data, completion: (() -> ())?) + public func write(ping: Foundation.Data, completion: (() -> ())?) + public func write(pong: Foundation.Data, completion: (() -> ())?) + public func didReceive(event: Starscream.WebSocketEvent) + @objc deinit +} +public class StringHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +public protocol EngineDelegate : AnyObject { + func didReceive(event: Starscream.WebSocketEvent) +} +public protocol Engine { + func register(delegate: Starscream.EngineDelegate) + func start(request: Foundation.URLRequest) + func stop(closeCode: Swift.UInt16) + func forceStop() + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + func write(string: Swift.String, completion: (() -> ())?) +} +public enum CloseCode : Swift.UInt16 { + case normal + case goingAway + case protocolError + case protocolUnhandledType + case noStatusReceived + case encoding + case policyViolated + case messageTooBig + public init?(rawValue: Swift.UInt16) + public typealias RawValue = Swift.UInt16 + public var rawValue: Swift.UInt16 { get } - public var request: Foundation.URLRequest - public var currentURL: Foundation.URL { +} +public enum FrameOpCode : Swift.UInt8 { + case continueFrame + case textFrame + case binaryFrame + case connectionClose + case ping + case pong + case unknown + public init?(rawValue: Swift.UInt8) + public typealias RawValue = Swift.UInt8 + public var rawValue: Swift.UInt8 { get } +} +public struct Frame { +} +public enum FrameEvent { + case frame(Starscream.Frame) + case error(Swift.Error) +} +public protocol FramerEventClient : AnyObject { + func frameProcessed(event: Starscream.FrameEvent) +} +public protocol Framer { + func add(data: Foundation.Data) + func register(delegate: Starscream.FramerEventClient) + func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + func updateCompression(supports: Swift.Bool) + func supportsCompression() -> Swift.Bool +} +public class WSFramer : Starscream.Framer { + public var compressionEnabled: Swift.Bool + public init(isServer: Swift.Bool = false) + public func updateCompression(supports: Swift.Bool) + public func supportsCompression() -> Swift.Bool + public func add(data: Foundation.Data) + public func register(delegate: Starscream.FramerEventClient) + public func createWriteFrame(opcode: Starscream.FrameOpCode, payload: Foundation.Data, isCompressed: Swift.Bool) -> Foundation.Data + @objc deinit +} +public protocol MyWSArrayType { +} +extension Swift.UInt8 : Starscream.MyWSArrayType { +} +extension Swift.Array where Element : Starscream.MyWSArrayType, Element : Swift.UnsignedInteger { + public func readUint16(offset: Swift.Int) -> Swift.UInt16 + public func readUint64(offset: Swift.Int) -> Swift.UInt64 + public func unmaskData(maskStart: Swift.Int, offset: Swift.Int, length: Swift.Int) -> Foundation.Data +} +public func writeUint16(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt16) +public func writeUint32(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt32) +public func writeUint64(_ buffer: inout [Swift.UInt8], offset: Swift.Int, value: Swift.UInt64) +@_hasMissingDesignatedInitializers public class FoundationHTTPServerHandler : Starscream.HTTPServerHandler { + public func register(delegate: Starscream.HTTPServerDelegate) + public func createResponse(headers: [Swift.String : Swift.String]) -> Foundation.Data + public func parse(data: Foundation.Data) + @objc deinit +} +public class WSEngine : Starscream.Engine, Starscream.TransportEventClient, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.HTTPHandlerDelegate { public var respondToPingWithPong: Swift.Bool - public init(request: Foundation.URLRequest, protocols: [Swift.String]? = nil, stream: Starscream.WSStream = FoundationStream()) - convenience public init(url: Foundation.URL, protocols: [Swift.String]? = nil) - convenience public init(url: Foundation.URL, writeQueueQOS: Foundation.QualityOfService, protocols: [Swift.String]? = nil) - open func connect() - open func disconnect(forceTimeout: Foundation.TimeInterval? = nil, closeCode: Swift.UInt16 = CloseCode.normal.rawValue) - open func write(string: Swift.String, completion: (() -> ())? = nil) - open func write(data: Foundation.Data, completion: (() -> ())? = nil) - open func write(ping: Foundation.Data, completion: (() -> ())? = nil) - open func write(pong: Foundation.Data, completion: (() -> ())? = nil) - public func newBytesInStream() - public func streamDidError(error: Swift.Error?) + public init(transport: Starscream.Transport, certPinner: Starscream.CertificatePinning? = nil, headerValidator: Starscream.HeaderValidator = FoundationSecurity(), httpHandler: Starscream.HTTPHandler = FoundationHTTPHandler(), framer: Starscream.Framer = WSFramer(), compressionHandler: Starscream.CompressionHandler? = nil) + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16 = CloseCode.normal.rawValue) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceiveHTTP(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func didForm(event: Starscream.FrameCollector.Event) @objc deinit - @objc override dynamic public init() } -public protocol SSLTrustValidator { - func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +public enum ConnectionState { + case connected + case waiting + case cancelled + case failed(Swift.Error?) + case viability(Swift.Bool) + case shouldReconnect(Swift.Bool) + case receive(Foundation.Data) +} +public protocol TransportEventClient : AnyObject { + func connectionChanged(state: Starscream.ConnectionState) } -open class SSLCert { - public init(data: Foundation.Data) - public init(key: Security.SecKey) +public protocol Transport : AnyObject { + func register(delegate: Starscream.TransportEventClient) + func connect(url: Foundation.URL, timeout: Swift.Double, certificatePinning: Starscream.CertificatePinning?) + func disconnect() + func write(data: Foundation.Data, completion: @escaping ((Swift.Error?) -> ())) + var usingTLS: Swift.Bool { get } +} +public class FoundationHTTPHandler : Starscream.HTTPHandler { + public init() + public func convert(request: Foundation.URLRequest) -> Foundation.Data + public func parse(data: Foundation.Data) -> Swift.Int + public func register(delegate: Starscream.HTTPHandlerDelegate) + @objc deinit +} +@available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +@available(watchOS, unavailable) +public class WebSocketServer : Starscream.Server, Starscream.ConnectionDelegate { + public var onEvent: ((Starscream.ServerEvent) -> Swift.Void)? + public init() + public func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? + public func didReceive(event: Starscream.ServerEvent) @objc deinit } -open class SSLSecurity : Starscream.SSLTrustValidator { - public var validatedDN: Swift.Bool - public var validateEntireChain: Swift.Bool - convenience public init(usePublicKeys: Swift.Bool = false) - public init(certs: [Starscream.SSLCert], usePublicKeys: Swift.Bool) - open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool - public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? - public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? - public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] - public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] +@_hasMissingDesignatedInitializers @available(macOS 10.14, iOS 12.0, watchOS 5.0, tvOS 12.0, *) +public class ServerConnection : Starscream.Connection, Starscream.HTTPServerDelegate, Starscream.FramerEventClient, Starscream.FrameCollectorDelegate, Starscream.TransportEventClient { + public var onEvent: ((Starscream.ConnectionEvent) -> Swift.Void)? + weak public var delegate: Starscream.ConnectionDelegate? + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) + public func connectionChanged(state: Starscream.ConnectionState) + public func didReceive(event: Starscream.HTTPEvent) + public func frameProcessed(event: Starscream.FrameEvent) + public func didForm(event: Starscream.FrameCollector.Event) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? @objc deinit } -public struct SSLClientCertificateError : Foundation.LocalizedError { - public var errorDescription: Swift.String? +public enum ConnectionEvent { + case connected([Swift.String : Swift.String]) + case disconnected(Swift.String, Swift.UInt16) + case text(Swift.String) + case binary(Foundation.Data) + case pong(Foundation.Data?) + case ping(Foundation.Data?) + case error(Swift.Error) +} +public protocol Connection { + func write(data: Foundation.Data, opcode: Starscream.FrameOpCode) +} +public protocol ConnectionDelegate : AnyObject { + func didReceive(event: Starscream.ServerEvent) +} +public enum ServerEvent { + case connected(Starscream.Connection, [Swift.String : Swift.String]) + case disconnected(Starscream.Connection, Swift.String, Swift.UInt16) + case text(Starscream.Connection, Swift.String) + case binary(Starscream.Connection, Foundation.Data) + case pong(Starscream.Connection, Foundation.Data?) + case ping(Starscream.Connection, Foundation.Data?) +} +public protocol Server { + func start(address: Swift.String, port: Swift.UInt16) -> Swift.Error? +} +public protocol CompressionHandler { + func load(headers: [Swift.String : Swift.String]) + func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + func compress(data: Foundation.Data) -> Foundation.Data? } -public class SSLClientCertificate { - convenience public init(pkcs12Path: Swift.String, password: Swift.String) throws - public init(identity: Security.SecIdentity, identityCertificate: Security.SecCertificate) - convenience public init(pkcs12Url: Foundation.URL, password: Swift.String) throws - public init(pkcs12Url: Foundation.URL, importOptions: CoreFoundation.CFDictionary) throws +public class WSCompression : Starscream.CompressionHandler { + public init() + public func load(headers: [Swift.String : Swift.String]) + public func decompress(data: Foundation.Data, isFinal: Swift.Bool) -> Foundation.Data? + public func compress(data: Foundation.Data) -> Foundation.Data? @objc deinit } +@objc @_inheritsConvenienceInitializers @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) +public class NativeEngine : ObjectiveC.NSObject, Starscream.Engine, Foundation.URLSessionDataDelegate, Foundation.URLSessionWebSocketDelegate { + public func register(delegate: Starscream.EngineDelegate) + public func start(request: Foundation.URLRequest) + public func stop(closeCode: Swift.UInt16) + public func forceStop() + public func write(string: Swift.String, completion: (() -> ())?) + public func write(data: Foundation.Data, opcode: Starscream.FrameOpCode, completion: (() -> ())?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didOpenWithProtocol protocol: Swift.String?) + @objc public func urlSession(_ session: Foundation.URLSession, webSocketTask: Foundation.URLSessionWebSocketTask, didCloseWith closeCode: Foundation.URLSessionWebSocketTask.CloseCode, reason: Foundation.Data?) + @objc override dynamic public init() + @objc deinit +} +extension Starscream.SecurityErrorCode : Swift.Equatable {} +extension Starscream.SecurityErrorCode : Swift.Hashable {} +extension Starscream.SecurityErrorCode : Swift.RawRepresentable {} +extension Starscream.TCPTransportError : Swift.Equatable {} +extension Starscream.TCPTransportError : Swift.Hashable {} +extension Starscream.FoundationSecurityError : Swift.Equatable {} +extension Starscream.FoundationSecurityError : Swift.Hashable {} +extension Starscream.FoundationTransportError : Swift.Equatable {} +extension Starscream.FoundationTransportError : Swift.Hashable {} +extension Starscream.ErrorType : Swift.Equatable {} +extension Starscream.ErrorType : Swift.Hashable {} extension Starscream.CloseCode : Swift.Equatable {} extension Starscream.CloseCode : Swift.Hashable {} extension Starscream.CloseCode : Swift.RawRepresentable {} -extension Starscream.ErrorType : Swift.Equatable {} -extension Starscream.ErrorType : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.Equatable {} -extension Starscream.WebSocket.OpCode : Swift.Hashable {} -extension Starscream.WebSocket.OpCode : Swift.RawRepresentable {} +extension Starscream.FrameOpCode : Swift.Equatable {} +extension Starscream.FrameOpCode : Swift.Hashable {} +extension Starscream.FrameOpCode : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Starscream b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Starscream index f6e3571..e6413c5 100755 Binary files a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Starscream and b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/Starscream differ diff --git a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/_CodeSignature/CodeResources b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/_CodeSignature/CodeResources index 99901db..6c8ce87 100644 --- a/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/_CodeSignature/CodeResources +++ b/EmbeddedFrameworks/Starscream.xcframework/ios-arm64_i386_x86_64-simulator/Starscream.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/Starscream-Swift.h - 6F3M+zB/hvNkNF7LK0bdVgryhCo= + 5J8lrM4d34BVrTA940izRKCjJxM= Headers/Starscream.h @@ -14,79 +14,79 @@ Info.plist - jegHx9w65of2TuoPMwH6oWlLwVo= + 6C3UGNg6bWvp18Z9em0CT3/22JA= Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftdoc - 5U4HoVjCjVjGsUuUxKnR/GruXSg= + Wtp5w9YykRv+xkbTLJVW1cMetcI= Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface - 3L1kmCNzolHaUKX6KrHYlwNkEGE= + Bn48mOemGFoZdrbRJ9DCm2kDiAE= Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftmodule - 0edLRwZPCzUZjhBXF+nB3d1FJ6k= + qCivRIRmOEpetJByOWjF6EKkfNA= Modules/Starscream.swiftmodule/arm64.swiftdoc - 5U4HoVjCjVjGsUuUxKnR/GruXSg= + Wtp5w9YykRv+xkbTLJVW1cMetcI= Modules/Starscream.swiftmodule/arm64.swiftinterface - 3L1kmCNzolHaUKX6KrHYlwNkEGE= + Bn48mOemGFoZdrbRJ9DCm2kDiAE= Modules/Starscream.swiftmodule/arm64.swiftmodule - 0edLRwZPCzUZjhBXF+nB3d1FJ6k= + qCivRIRmOEpetJByOWjF6EKkfNA= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc - P3jGdBaJrtZkN9w/9wmRORVTV10= + zXf9WHJ74ktd3wPCbraSsJ4AnOE= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface - XaUAdjfTXwyqJXTapd/R/gc6Hdk= + EFAAH9v9tyE2scJdiqLK/SHNj18= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftmodule - RgwW3RtKfW0+opBbPOOc/yENVwM= + 9+u80kKvPpPLDPAwqsvL0OSIV3c= Modules/Starscream.swiftmodule/i386.swiftdoc - P3jGdBaJrtZkN9w/9wmRORVTV10= + zXf9WHJ74ktd3wPCbraSsJ4AnOE= Modules/Starscream.swiftmodule/i386.swiftinterface - XaUAdjfTXwyqJXTapd/R/gc6Hdk= + EFAAH9v9tyE2scJdiqLK/SHNj18= Modules/Starscream.swiftmodule/i386.swiftmodule - RgwW3RtKfW0+opBbPOOc/yENVwM= + 9+u80kKvPpPLDPAwqsvL0OSIV3c= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc - PQaTXUL320M5ItZFt4QNFqIhUMI= + 1TbxDENpb5f/jUAQUdLTSyaZvbQ= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - XdQapV4je216yU/Ds6hj+BJ8W98= + l+eU3VU/cwLOeD79KwAGSqm4ylw= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - xZZ0OJ/SpmgJ/dC8txs9aaVbl6s= + TIxg/qKsvKGh8SK204p7d8/3tPY= Modules/Starscream.swiftmodule/x86_64.swiftdoc - PQaTXUL320M5ItZFt4QNFqIhUMI= + 1TbxDENpb5f/jUAQUdLTSyaZvbQ= Modules/Starscream.swiftmodule/x86_64.swiftinterface - XdQapV4je216yU/Ds6hj+BJ8W98= + l+eU3VU/cwLOeD79KwAGSqm4ylw= Modules/Starscream.swiftmodule/x86_64.swiftmodule - xZZ0OJ/SpmgJ/dC8txs9aaVbl6s= + TIxg/qKsvKGh8SK204p7d8/3tPY= Modules/module.modulemap @@ -99,11 +99,11 @@ hash - 6F3M+zB/hvNkNF7LK0bdVgryhCo= + 5J8lrM4d34BVrTA940izRKCjJxM= hash2 - +3qFLDHjKVXDE/kF/l5guqZY6GnOontRaHpDTFeZ0Ss= + u0HvOluaV3zGqxDgr0Wl6tnq95MnnEVMD62qvu1YuYI= Headers/Starscream.h @@ -121,198 +121,198 @@ hash - 5U4HoVjCjVjGsUuUxKnR/GruXSg= + Wtp5w9YykRv+xkbTLJVW1cMetcI= hash2 - jHJQcjTlrQ2NvS9ErrWC0tn2+BadBnFYpEvPhLjiWJ0= + kNv2faD0uEbFW4XZHlkTe1MCJebhak3rrjwFCKbuYLc= Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftinterface hash - 3L1kmCNzolHaUKX6KrHYlwNkEGE= + Bn48mOemGFoZdrbRJ9DCm2kDiAE= hash2 - b3YvDqk29dteG0fDt804CWMJtK1xrfjLCKn7M+dYnG4= + AEiGUEoL0o8tLTTeo7nvg1E7/LssoWVlz5odZy2sH4A= Modules/Starscream.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash - 0edLRwZPCzUZjhBXF+nB3d1FJ6k= + qCivRIRmOEpetJByOWjF6EKkfNA= hash2 - GQOAjt0ut4K/ZPF478Y2CVEZm4tVXY+jIEHmzU4Pb/I= + 4r4WkLIfUQ8BFSteIknMI1h0S75ZH1EiRHGvHrSbwG4= Modules/Starscream.swiftmodule/arm64.swiftdoc hash - 5U4HoVjCjVjGsUuUxKnR/GruXSg= + Wtp5w9YykRv+xkbTLJVW1cMetcI= hash2 - jHJQcjTlrQ2NvS9ErrWC0tn2+BadBnFYpEvPhLjiWJ0= + kNv2faD0uEbFW4XZHlkTe1MCJebhak3rrjwFCKbuYLc= Modules/Starscream.swiftmodule/arm64.swiftinterface hash - 3L1kmCNzolHaUKX6KrHYlwNkEGE= + Bn48mOemGFoZdrbRJ9DCm2kDiAE= hash2 - b3YvDqk29dteG0fDt804CWMJtK1xrfjLCKn7M+dYnG4= + AEiGUEoL0o8tLTTeo7nvg1E7/LssoWVlz5odZy2sH4A= Modules/Starscream.swiftmodule/arm64.swiftmodule hash - 0edLRwZPCzUZjhBXF+nB3d1FJ6k= + qCivRIRmOEpetJByOWjF6EKkfNA= hash2 - GQOAjt0ut4K/ZPF478Y2CVEZm4tVXY+jIEHmzU4Pb/I= + 4r4WkLIfUQ8BFSteIknMI1h0S75ZH1EiRHGvHrSbwG4= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftdoc hash - P3jGdBaJrtZkN9w/9wmRORVTV10= + zXf9WHJ74ktd3wPCbraSsJ4AnOE= hash2 - fgr0OySxHeagbnsx+gRjShcYxAGBzyhbeoRflx6UyrE= + Xdrw2KcNSO53Poxzu+oVGnr36wsEW3V3wUJDBdhoSKk= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftinterface hash - XaUAdjfTXwyqJXTapd/R/gc6Hdk= + EFAAH9v9tyE2scJdiqLK/SHNj18= hash2 - Rzqw1Bm7iR1AxzOq3kuHKg9yCbf4Pt6TV7KsTGdApx4= + 3Yu9RMIf9Bp4dugRYT3Lenz9OThuFL7ilqnZO8ZICA0= Modules/Starscream.swiftmodule/i386-apple-ios-simulator.swiftmodule hash - RgwW3RtKfW0+opBbPOOc/yENVwM= + 9+u80kKvPpPLDPAwqsvL0OSIV3c= hash2 - BanoqvRANgTydKDmE+xI8mrCI2+pGuznlRxZnFYb1/M= + EICXEamVnoTtxCJKbXhYMzQy3Toz+I5Ef+3uuRs+kc4= Modules/Starscream.swiftmodule/i386.swiftdoc hash - P3jGdBaJrtZkN9w/9wmRORVTV10= + zXf9WHJ74ktd3wPCbraSsJ4AnOE= hash2 - fgr0OySxHeagbnsx+gRjShcYxAGBzyhbeoRflx6UyrE= + Xdrw2KcNSO53Poxzu+oVGnr36wsEW3V3wUJDBdhoSKk= Modules/Starscream.swiftmodule/i386.swiftinterface hash - XaUAdjfTXwyqJXTapd/R/gc6Hdk= + EFAAH9v9tyE2scJdiqLK/SHNj18= hash2 - Rzqw1Bm7iR1AxzOq3kuHKg9yCbf4Pt6TV7KsTGdApx4= + 3Yu9RMIf9Bp4dugRYT3Lenz9OThuFL7ilqnZO8ZICA0= Modules/Starscream.swiftmodule/i386.swiftmodule hash - RgwW3RtKfW0+opBbPOOc/yENVwM= + 9+u80kKvPpPLDPAwqsvL0OSIV3c= hash2 - BanoqvRANgTydKDmE+xI8mrCI2+pGuznlRxZnFYb1/M= + EICXEamVnoTtxCJKbXhYMzQy3Toz+I5Ef+3uuRs+kc4= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftdoc hash - PQaTXUL320M5ItZFt4QNFqIhUMI= + 1TbxDENpb5f/jUAQUdLTSyaZvbQ= hash2 - ziah2JuEnlsZFdSDPqlGfEFi0irP/t3yr5JelMhDbrk= + qFhkvA+QypSSGEY7LrYc9coYckrlfxpzuGfPbwTJPzw= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftinterface hash - XdQapV4je216yU/Ds6hj+BJ8W98= + l+eU3VU/cwLOeD79KwAGSqm4ylw= hash2 - xENd8vtuCq6WYlLtGOV59yIPkho0TXrTDSXwjT/tXSM= + zW06JbKTqs2ZL/ZxThThwtjbMUSxwGGY/Gr0mLvyEd4= Modules/Starscream.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash - xZZ0OJ/SpmgJ/dC8txs9aaVbl6s= + TIxg/qKsvKGh8SK204p7d8/3tPY= hash2 - 5pzLAgQXBSlKH123XkJ4ZDZ1mDrlQnxShYaikMhxZRQ= + 4RlNQXvh45i73RS1M8GJJeH5KGhu4nyr5aR6u8H6EEM= Modules/Starscream.swiftmodule/x86_64.swiftdoc hash - PQaTXUL320M5ItZFt4QNFqIhUMI= + 1TbxDENpb5f/jUAQUdLTSyaZvbQ= hash2 - ziah2JuEnlsZFdSDPqlGfEFi0irP/t3yr5JelMhDbrk= + qFhkvA+QypSSGEY7LrYc9coYckrlfxpzuGfPbwTJPzw= Modules/Starscream.swiftmodule/x86_64.swiftinterface hash - XdQapV4je216yU/Ds6hj+BJ8W98= + l+eU3VU/cwLOeD79KwAGSqm4ylw= hash2 - xENd8vtuCq6WYlLtGOV59yIPkho0TXrTDSXwjT/tXSM= + zW06JbKTqs2ZL/ZxThThwtjbMUSxwGGY/Gr0mLvyEd4= Modules/Starscream.swiftmodule/x86_64.swiftmodule hash - xZZ0OJ/SpmgJ/dC8txs9aaVbl6s= + TIxg/qKsvKGh8SK204p7d8/3tPY= hash2 - 5pzLAgQXBSlKH123XkJ4ZDZ1mDrlQnxShYaikMhxZRQ= + 4RlNQXvh45i73RS1M8GJJeH5KGhu4nyr5aR6u8H6EEM= Modules/module.modulemap diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Assets.car b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Assets.car index 35af615..b1cb0fb 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Assets.car and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Assets.car differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Localizable.strings b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Localizable.strings index 0d01ab1..dfe7de4 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Localizable.strings and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Localizable.strings differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib index e1fa501..36d5124 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib index 3e14be2..87a2a07 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Headers/iProov-Swift.h b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Headers/iProov-Swift.h index 6bf3847..343e4d2 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Headers/iProov-Swift.h +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Headers/iProov-Swift.h @@ -219,19 +219,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -SWIFT_CLASS("_TtC6iProov14CaptureOptions") -@interface CaptureOptions : NSObject -@property (nonatomic) CGFloat maxYaw; -@property (nonatomic) CGFloat maxRoll; -@property (nonatomic) CGFloat maxPitch; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - @class UIImage; -SWIFT_CLASS("_TtC6iProov13FailureResult") -@interface FailureResult : NSObject +SWIFT_CLASS_NAMED("FailureResult") +@interface IPFailureResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, copy) NSString * _Nonnull reason; @property (nonatomic, readonly, copy) NSString * _Nonnull feedbackCode; @@ -240,11 +231,6 @@ SWIFT_CLASS("_TtC6iProov13FailureResult") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -typedef SWIFT_ENUM(NSInteger, Filter, open) { - FilterClassic = 0, - FilterShaded = 1, - FilterVibrant = 2, -}; SWIFT_CLASS_NAMED("IProov") @@ -253,19 +239,20 @@ SWIFT_CLASS_NAMED("IProov") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class Options; -@class SuccessResult; +@class IPOptions; +@class IPSuccessResult; @class NSError; @interface IProov (SWIFT_EXTENSION(iProov)) -+ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(Options * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(SuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(FailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; ++ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(IPOptions * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(IPSuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(IPFailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; @end @class IPKeyPair; @interface IProov (SWIFT_EXTENSION(iProov)) -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) IPKeyPair * _Nonnull keyPair SWIFT_AVAILABILITY(ios,introduced=10.0);) +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) IPKeyPair * _Nonnull keyPair;) + (IPKeyPair * _Nonnull)keyPair SWIFT_WARN_UNUSED_RESULT; ++ (void)setKeyPair:(IPKeyPair * _Nonnull)value; @end @@ -273,18 +260,14 @@ SWIFT_CLASS_NAMED("IProovErrorCode") @interface IPErrorCode : NSObject SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger networkError;) + (NSInteger)networkError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger encoderError;) -+ (NSInteger)encoderError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraError;) -+ (NSInteger)cameraError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger serverError;) + (NSInteger)serverError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger captureAlreadyActive;) + (NSInteger)captureAlreadyActive SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger lightingModelError;) -+ (NSInteger)lightingModelError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraPermissionDenied;) + (NSInteger)cameraPermissionDenied SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger unexpectedError;) ++ (NSInteger)unexpectedError SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -298,7 +281,7 @@ SWIFT_PROTOCOL("_TtP6iProov26IProovPresentationDelegate_") @class IPPublicKey; -SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("KeyPair") @interface IPKeyPair : NSObject @property (nonatomic, readonly, strong) IPPublicKey * _Nonnull publicKey; @property (nonatomic, readonly) BOOL isInSecureEnclave; @@ -309,33 +292,105 @@ SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov14NetworkOptions") -@interface NetworkOptions : NSObject -@property (nonatomic, copy) NSArray * _Nonnull certificates; -@property (nonatomic) BOOL certificatePinningDisabled; + + + +@class IPUIOptions; +@class IPNetworkOptions; +@class IPCaptureOptions; + +SWIFT_CLASS_NAMED("Options") +@interface IPOptions : NSObject +@property (nonatomic, strong) IPUIOptions * _Nonnull ui; +@property (nonatomic, strong) IPNetworkOptions * _Nonnull network; +@property (nonatomic, strong) IPCaptureOptions * _Nonnull capture; +/// Create Options from a JSON string representation ++ (IPOptions * _Nonnull)fromJson:(NSDictionary * _Nonnull)json SWIFT_WARN_UNUSED_RESULT; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +enum IPFilter : NSInteger; +@class NSBundle; +@class UIColor; +@class IPGenuinePresenceAssuranceUIOptions; +@class IPLivenessAssuranceUIOptions; + +SWIFT_CLASS_NAMED("UI") +@interface IPUIOptions : NSObject +@property (nonatomic) enum IPFilter filter; +@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; +@property (nonatomic, copy) NSString * _Nullable stringsTable; +@property (nonatomic, strong) UIColor * _Nonnull lineColor; +@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; +@property (nonatomic, copy) NSString * _Nullable title; +@property (nonatomic, copy) NSString * _Nonnull font; +@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; +@property (nonatomic, strong) UIImage * _Nullable logoImage; +@property (nonatomic, strong) IPGenuinePresenceAssuranceUIOptions * _Nonnull genuinePresenceAssurance; +@property (nonatomic, strong) IPLivenessAssuranceUIOptions * _Nonnull livenessAssurance; +@property (nonatomic, weak) id _Nullable presentationDelegate; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +@end + + +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceUIOptions : NSObject +@property (nonatomic) BOOL autoStartDisabled; +@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("LivenessAssurance") +@interface IPLivenessAssuranceUIOptions : NSObject +@property (nonatomic, strong) UIColor * _Nonnull primaryTintColor; +@property (nonatomic, strong) UIColor * _Nonnull secondaryTintColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("Network") +@interface IPNetworkOptions : NSObject +@property (nonatomic, copy) NSArray * _Nonnull certificates; @property (nonatomic) NSTimeInterval timeout; @property (nonatomic, copy) NSString * _Nonnull path; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +@class IPGenuinePresenceAssuranceCaptureOptions; +SWIFT_CLASS_NAMED("Capture") +@interface IPCaptureOptions : NSObject +@property (nonatomic, strong) IPGenuinePresenceAssuranceCaptureOptions * _Nonnull genuinePresenceAssurance; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end -@class UIOptions; - -SWIFT_CLASS("_TtC6iProov7Options") -@interface Options : NSObject -@property (nonatomic, strong) UIOptions * _Nonnull ui; -@property (nonatomic, strong) NetworkOptions * _Nonnull network; -@property (nonatomic, strong) CaptureOptions * _Nonnull capture; -/// Create Options from a JSON string representation -+ (Options * _Nonnull)fromJsonString:(NSString * _Nonnull)jsonString SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceCaptureOptions : NSObject +@property (nonatomic) CGFloat maxYaw; +@property (nonatomic) CGFloat maxRoll; +@property (nonatomic) CGFloat maxPitch; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +typedef SWIFT_ENUM_NAMED(NSInteger, IPFilter, "Filter", open) { + IPFilterClassic = 0, + IPFilterShaded = 1, + IPFilterVibrant = 2, +}; + -SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("PublicKey") @interface IPPublicKey : NSObject @property (nonatomic, readonly) SecKeyRef _Nonnull key; @property (nonatomic, readonly, copy) NSString * _Nonnull pem; @@ -346,8 +401,8 @@ SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov13SuccessResult") -@interface SuccessResult : NSObject +SWIFT_CLASS_NAMED("SuccessResult") +@interface IPSuccessResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, strong) UIImage * _Nullable frame; - (nonnull instancetype)init SWIFT_UNAVAILABLE; @@ -364,38 +419,6 @@ SWIFT_CLASS("_TtC6iProov13SuccessResult") -@class NSBundle; -@class UIColor; - -SWIFT_CLASS("_TtC6iProov9UIOptions") -@interface UIOptions : NSObject -@property (nonatomic) BOOL autoStartDisabled; -@property (nonatomic) enum Filter filter; -@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; -@property (nonatomic, copy) NSString * _Nullable stringsTable; -@property (nonatomic, strong) UIColor * _Nonnull lineColor; -@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull loadingTintColor SWIFT_DEPRECATED; -@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessScanningTintColor; -@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; -@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; -@property (nonatomic, copy) NSString * _Nullable title; -@property (nonatomic, copy) NSString * _Nonnull font; -@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; -@property (nonatomic, strong) UIImage * _Nullable logoImage; -@property (nonatomic) BOOL scanLineDisabled; -@property (nonatomic, weak) id _Nullable presentationDelegate; -@property (nonatomic) BOOL useLegacyConnectingUI SWIFT_DEPRECATED; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end @@ -633,19 +656,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -SWIFT_CLASS("_TtC6iProov14CaptureOptions") -@interface CaptureOptions : NSObject -@property (nonatomic) CGFloat maxYaw; -@property (nonatomic) CGFloat maxRoll; -@property (nonatomic) CGFloat maxPitch; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - @class UIImage; -SWIFT_CLASS("_TtC6iProov13FailureResult") -@interface FailureResult : NSObject +SWIFT_CLASS_NAMED("FailureResult") +@interface IPFailureResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, copy) NSString * _Nonnull reason; @property (nonatomic, readonly, copy) NSString * _Nonnull feedbackCode; @@ -654,11 +668,6 @@ SWIFT_CLASS("_TtC6iProov13FailureResult") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -typedef SWIFT_ENUM(NSInteger, Filter, open) { - FilterClassic = 0, - FilterShaded = 1, - FilterVibrant = 2, -}; SWIFT_CLASS_NAMED("IProov") @@ -667,19 +676,20 @@ SWIFT_CLASS_NAMED("IProov") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class Options; -@class SuccessResult; +@class IPOptions; +@class IPSuccessResult; @class NSError; @interface IProov (SWIFT_EXTENSION(iProov)) -+ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(Options * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(SuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(FailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; ++ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(IPOptions * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(IPSuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(IPFailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; @end @class IPKeyPair; @interface IProov (SWIFT_EXTENSION(iProov)) -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) IPKeyPair * _Nonnull keyPair SWIFT_AVAILABILITY(ios,introduced=10.0);) +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) IPKeyPair * _Nonnull keyPair;) + (IPKeyPair * _Nonnull)keyPair SWIFT_WARN_UNUSED_RESULT; ++ (void)setKeyPair:(IPKeyPair * _Nonnull)value; @end @@ -687,18 +697,14 @@ SWIFT_CLASS_NAMED("IProovErrorCode") @interface IPErrorCode : NSObject SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger networkError;) + (NSInteger)networkError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger encoderError;) -+ (NSInteger)encoderError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraError;) -+ (NSInteger)cameraError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger serverError;) + (NSInteger)serverError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger captureAlreadyActive;) + (NSInteger)captureAlreadyActive SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger lightingModelError;) -+ (NSInteger)lightingModelError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraPermissionDenied;) + (NSInteger)cameraPermissionDenied SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger unexpectedError;) ++ (NSInteger)unexpectedError SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -712,7 +718,7 @@ SWIFT_PROTOCOL("_TtP6iProov26IProovPresentationDelegate_") @class IPPublicKey; -SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("KeyPair") @interface IPKeyPair : NSObject @property (nonatomic, readonly, strong) IPPublicKey * _Nonnull publicKey; @property (nonatomic, readonly) BOOL isInSecureEnclave; @@ -723,33 +729,105 @@ SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov14NetworkOptions") -@interface NetworkOptions : NSObject -@property (nonatomic, copy) NSArray * _Nonnull certificates; -@property (nonatomic) BOOL certificatePinningDisabled; + + + +@class IPUIOptions; +@class IPNetworkOptions; +@class IPCaptureOptions; + +SWIFT_CLASS_NAMED("Options") +@interface IPOptions : NSObject +@property (nonatomic, strong) IPUIOptions * _Nonnull ui; +@property (nonatomic, strong) IPNetworkOptions * _Nonnull network; +@property (nonatomic, strong) IPCaptureOptions * _Nonnull capture; +/// Create Options from a JSON string representation ++ (IPOptions * _Nonnull)fromJson:(NSDictionary * _Nonnull)json SWIFT_WARN_UNUSED_RESULT; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +enum IPFilter : NSInteger; +@class NSBundle; +@class UIColor; +@class IPGenuinePresenceAssuranceUIOptions; +@class IPLivenessAssuranceUIOptions; + +SWIFT_CLASS_NAMED("UI") +@interface IPUIOptions : NSObject +@property (nonatomic) enum IPFilter filter; +@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; +@property (nonatomic, copy) NSString * _Nullable stringsTable; +@property (nonatomic, strong) UIColor * _Nonnull lineColor; +@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; +@property (nonatomic, copy) NSString * _Nullable title; +@property (nonatomic, copy) NSString * _Nonnull font; +@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; +@property (nonatomic, strong) UIImage * _Nullable logoImage; +@property (nonatomic, strong) IPGenuinePresenceAssuranceUIOptions * _Nonnull genuinePresenceAssurance; +@property (nonatomic, strong) IPLivenessAssuranceUIOptions * _Nonnull livenessAssurance; +@property (nonatomic, weak) id _Nullable presentationDelegate; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +@end + + +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceUIOptions : NSObject +@property (nonatomic) BOOL autoStartDisabled; +@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("LivenessAssurance") +@interface IPLivenessAssuranceUIOptions : NSObject +@property (nonatomic, strong) UIColor * _Nonnull primaryTintColor; +@property (nonatomic, strong) UIColor * _Nonnull secondaryTintColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("Network") +@interface IPNetworkOptions : NSObject +@property (nonatomic, copy) NSArray * _Nonnull certificates; @property (nonatomic) NSTimeInterval timeout; @property (nonatomic, copy) NSString * _Nonnull path; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +@class IPGenuinePresenceAssuranceCaptureOptions; +SWIFT_CLASS_NAMED("Capture") +@interface IPCaptureOptions : NSObject +@property (nonatomic, strong) IPGenuinePresenceAssuranceCaptureOptions * _Nonnull genuinePresenceAssurance; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end -@class UIOptions; - -SWIFT_CLASS("_TtC6iProov7Options") -@interface Options : NSObject -@property (nonatomic, strong) UIOptions * _Nonnull ui; -@property (nonatomic, strong) NetworkOptions * _Nonnull network; -@property (nonatomic, strong) CaptureOptions * _Nonnull capture; -/// Create Options from a JSON string representation -+ (Options * _Nonnull)fromJsonString:(NSString * _Nonnull)jsonString SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceCaptureOptions : NSObject +@property (nonatomic) CGFloat maxYaw; +@property (nonatomic) CGFloat maxRoll; +@property (nonatomic) CGFloat maxPitch; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +typedef SWIFT_ENUM_NAMED(NSInteger, IPFilter, "Filter", open) { + IPFilterClassic = 0, + IPFilterShaded = 1, + IPFilterVibrant = 2, +}; + -SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("PublicKey") @interface IPPublicKey : NSObject @property (nonatomic, readonly) SecKeyRef _Nonnull key; @property (nonatomic, readonly, copy) NSString * _Nonnull pem; @@ -760,8 +838,8 @@ SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov13SuccessResult") -@interface SuccessResult : NSObject +SWIFT_CLASS_NAMED("SuccessResult") +@interface IPSuccessResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, strong) UIImage * _Nullable frame; - (nonnull instancetype)init SWIFT_UNAVAILABLE; @@ -778,38 +856,6 @@ SWIFT_CLASS("_TtC6iProov13SuccessResult") -@class NSBundle; -@class UIColor; - -SWIFT_CLASS("_TtC6iProov9UIOptions") -@interface UIOptions : NSObject -@property (nonatomic) BOOL autoStartDisabled; -@property (nonatomic) enum Filter filter; -@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; -@property (nonatomic, copy) NSString * _Nullable stringsTable; -@property (nonatomic, strong) UIColor * _Nonnull lineColor; -@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull loadingTintColor SWIFT_DEPRECATED; -@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessScanningTintColor; -@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; -@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; -@property (nonatomic, copy) NSString * _Nullable title; -@property (nonatomic, copy) NSString * _Nonnull font; -@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; -@property (nonatomic, strong) UIImage * _Nullable logoImage; -@property (nonatomic) BOOL scanLineDisabled; -@property (nonatomic, weak) id _Nullable presentationDelegate; -@property (nonatomic) BOOL useLegacyConnectingUI SWIFT_DEPRECATED; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Info.plist b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Info.plist index e37453b..a01635a 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Info.plist and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Info.plist differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftdoc index d276b71..5d62bfb 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftinterface index a9255d4..e7a8790 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftdoc index 924d847..5fe9a62 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftinterface index c48c26b..a0d66d4 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc index 924d847..5fe9a62 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface index c48c26b..a0d66d4 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftdoc index d276b71..5d62bfb 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftinterface index a9255d4..e7a8790 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7-apple-ios.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftdoc index d276b71..5d62bfb 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftinterface index a9255d4..e7a8790 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/Modules/iProov.swiftmodule/armv7.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target armv7-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target armv7-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov index 25fa33a..4a75639 100755 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov.plist b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov.plist new file mode 100644 index 0000000..7d186fc Binary files /dev/null and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_armv7/iProov.framework/iProov.plist differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Assets.car b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Assets.car index 35af615..b1cb0fb 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Assets.car and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Assets.car differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Localizable.strings b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Localizable.strings index 0d01ab1..dfe7de4 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Localizable.strings and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Localizable.strings differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib index 07dc431..702683f 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/BYZ-38-t0r-view-8bC-Xf-vdC.nib differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib index aa919ab..2f0d176 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Base.lproj/Main.storyboardc/IProovViewController.nib differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Headers/iProov-Swift.h b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Headers/iProov-Swift.h index 25fa549..87aff4d 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Headers/iProov-Swift.h +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Headers/iProov-Swift.h @@ -219,19 +219,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -SWIFT_CLASS("_TtC6iProov14CaptureOptions") -@interface CaptureOptions : NSObject -@property (nonatomic) CGFloat maxYaw; -@property (nonatomic) CGFloat maxRoll; -@property (nonatomic) CGFloat maxPitch; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - @class UIImage; -SWIFT_CLASS("_TtC6iProov13FailureResult") -@interface FailureResult : NSObject +SWIFT_CLASS_NAMED("FailureResult") +@interface IPFailureResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, copy) NSString * _Nonnull reason; @property (nonatomic, readonly, copy) NSString * _Nonnull feedbackCode; @@ -240,11 +231,6 @@ SWIFT_CLASS("_TtC6iProov13FailureResult") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -typedef SWIFT_ENUM(NSInteger, Filter, open) { - FilterClassic = 0, - FilterShaded = 1, - FilterVibrant = 2, -}; SWIFT_CLASS_NAMED("IProov") @@ -253,19 +239,20 @@ SWIFT_CLASS_NAMED("IProov") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class Options; -@class SuccessResult; +@class IPOptions; +@class IPSuccessResult; @class NSError; @interface IProov (SWIFT_EXTENSION(iProov)) -+ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(Options * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(SuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(FailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; ++ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(IPOptions * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(IPSuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(IPFailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; @end @class IPKeyPair; @interface IProov (SWIFT_EXTENSION(iProov)) -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) IPKeyPair * _Nonnull keyPair SWIFT_AVAILABILITY(ios,introduced=10.0);) +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) IPKeyPair * _Nonnull keyPair;) + (IPKeyPair * _Nonnull)keyPair SWIFT_WARN_UNUSED_RESULT; ++ (void)setKeyPair:(IPKeyPair * _Nonnull)value; @end @@ -273,18 +260,14 @@ SWIFT_CLASS_NAMED("IProovErrorCode") @interface IPErrorCode : NSObject SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger networkError;) + (NSInteger)networkError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger encoderError;) -+ (NSInteger)encoderError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraError;) -+ (NSInteger)cameraError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger serverError;) + (NSInteger)serverError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger captureAlreadyActive;) + (NSInteger)captureAlreadyActive SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger lightingModelError;) -+ (NSInteger)lightingModelError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraPermissionDenied;) + (NSInteger)cameraPermissionDenied SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger unexpectedError;) ++ (NSInteger)unexpectedError SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -298,7 +281,7 @@ SWIFT_PROTOCOL("_TtP6iProov26IProovPresentationDelegate_") @class IPPublicKey; -SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("KeyPair") @interface IPKeyPair : NSObject @property (nonatomic, readonly, strong) IPPublicKey * _Nonnull publicKey; @property (nonatomic, readonly) BOOL isInSecureEnclave; @@ -309,33 +292,105 @@ SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov14NetworkOptions") -@interface NetworkOptions : NSObject -@property (nonatomic, copy) NSArray * _Nonnull certificates; -@property (nonatomic) BOOL certificatePinningDisabled; + + + +@class IPUIOptions; +@class IPNetworkOptions; +@class IPCaptureOptions; + +SWIFT_CLASS_NAMED("Options") +@interface IPOptions : NSObject +@property (nonatomic, strong) IPUIOptions * _Nonnull ui; +@property (nonatomic, strong) IPNetworkOptions * _Nonnull network; +@property (nonatomic, strong) IPCaptureOptions * _Nonnull capture; +/// Create Options from a JSON string representation ++ (IPOptions * _Nonnull)fromJson:(NSDictionary * _Nonnull)json SWIFT_WARN_UNUSED_RESULT; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +enum IPFilter : NSInteger; +@class NSBundle; +@class UIColor; +@class IPGenuinePresenceAssuranceUIOptions; +@class IPLivenessAssuranceUIOptions; + +SWIFT_CLASS_NAMED("UI") +@interface IPUIOptions : NSObject +@property (nonatomic) enum IPFilter filter; +@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; +@property (nonatomic, copy) NSString * _Nullable stringsTable; +@property (nonatomic, strong) UIColor * _Nonnull lineColor; +@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; +@property (nonatomic, copy) NSString * _Nullable title; +@property (nonatomic, copy) NSString * _Nonnull font; +@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; +@property (nonatomic, strong) UIImage * _Nullable logoImage; +@property (nonatomic, strong) IPGenuinePresenceAssuranceUIOptions * _Nonnull genuinePresenceAssurance; +@property (nonatomic, strong) IPLivenessAssuranceUIOptions * _Nonnull livenessAssurance; +@property (nonatomic, weak) id _Nullable presentationDelegate; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +@end + + +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceUIOptions : NSObject +@property (nonatomic) BOOL autoStartDisabled; +@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("LivenessAssurance") +@interface IPLivenessAssuranceUIOptions : NSObject +@property (nonatomic, strong) UIColor * _Nonnull primaryTintColor; +@property (nonatomic, strong) UIColor * _Nonnull secondaryTintColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("Network") +@interface IPNetworkOptions : NSObject +@property (nonatomic, copy) NSArray * _Nonnull certificates; @property (nonatomic) NSTimeInterval timeout; @property (nonatomic, copy) NSString * _Nonnull path; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +@class IPGenuinePresenceAssuranceCaptureOptions; +SWIFT_CLASS_NAMED("Capture") +@interface IPCaptureOptions : NSObject +@property (nonatomic, strong) IPGenuinePresenceAssuranceCaptureOptions * _Nonnull genuinePresenceAssurance; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end -@class UIOptions; - -SWIFT_CLASS("_TtC6iProov7Options") -@interface Options : NSObject -@property (nonatomic, strong) UIOptions * _Nonnull ui; -@property (nonatomic, strong) NetworkOptions * _Nonnull network; -@property (nonatomic, strong) CaptureOptions * _Nonnull capture; -/// Create Options from a JSON string representation -+ (Options * _Nonnull)fromJsonString:(NSString * _Nonnull)jsonString SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceCaptureOptions : NSObject +@property (nonatomic) CGFloat maxYaw; +@property (nonatomic) CGFloat maxRoll; +@property (nonatomic) CGFloat maxPitch; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +typedef SWIFT_ENUM_NAMED(NSInteger, IPFilter, "Filter", open) { + IPFilterClassic = 0, + IPFilterShaded = 1, + IPFilterVibrant = 2, +}; + -SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("PublicKey") @interface IPPublicKey : NSObject @property (nonatomic, readonly) SecKeyRef _Nonnull key; @property (nonatomic, readonly, copy) NSString * _Nonnull pem; @@ -346,8 +401,8 @@ SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov13SuccessResult") -@interface SuccessResult : NSObject +SWIFT_CLASS_NAMED("SuccessResult") +@interface IPSuccessResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, strong) UIImage * _Nullable frame; - (nonnull instancetype)init SWIFT_UNAVAILABLE; @@ -364,38 +419,6 @@ SWIFT_CLASS("_TtC6iProov13SuccessResult") -@class NSBundle; -@class UIColor; - -SWIFT_CLASS("_TtC6iProov9UIOptions") -@interface UIOptions : NSObject -@property (nonatomic) BOOL autoStartDisabled; -@property (nonatomic) enum Filter filter; -@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; -@property (nonatomic, copy) NSString * _Nullable stringsTable; -@property (nonatomic, strong) UIColor * _Nonnull lineColor; -@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull loadingTintColor SWIFT_DEPRECATED; -@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessScanningTintColor; -@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; -@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; -@property (nonatomic, copy) NSString * _Nullable title; -@property (nonatomic, copy) NSString * _Nonnull font; -@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; -@property (nonatomic, strong) UIImage * _Nullable logoImage; -@property (nonatomic) BOOL scanLineDisabled; -@property (nonatomic, weak) id _Nullable presentationDelegate; -@property (nonatomic) BOOL useLegacyConnectingUI SWIFT_DEPRECATED; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end @@ -633,19 +656,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -SWIFT_CLASS("_TtC6iProov14CaptureOptions") -@interface CaptureOptions : NSObject -@property (nonatomic) CGFloat maxYaw; -@property (nonatomic) CGFloat maxRoll; -@property (nonatomic) CGFloat maxPitch; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - @class UIImage; -SWIFT_CLASS("_TtC6iProov13FailureResult") -@interface FailureResult : NSObject +SWIFT_CLASS_NAMED("FailureResult") +@interface IPFailureResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, copy) NSString * _Nonnull reason; @property (nonatomic, readonly, copy) NSString * _Nonnull feedbackCode; @@ -654,11 +668,6 @@ SWIFT_CLASS("_TtC6iProov13FailureResult") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -typedef SWIFT_ENUM(NSInteger, Filter, open) { - FilterClassic = 0, - FilterShaded = 1, - FilterVibrant = 2, -}; SWIFT_CLASS_NAMED("IProov") @@ -667,19 +676,20 @@ SWIFT_CLASS_NAMED("IProov") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class Options; -@class SuccessResult; +@class IPOptions; +@class IPSuccessResult; @class NSError; @interface IProov (SWIFT_EXTENSION(iProov)) -+ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(Options * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(SuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(FailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; ++ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(IPOptions * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(IPSuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(IPFailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; @end @class IPKeyPair; @interface IProov (SWIFT_EXTENSION(iProov)) -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) IPKeyPair * _Nonnull keyPair SWIFT_AVAILABILITY(ios,introduced=10.0);) +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) IPKeyPair * _Nonnull keyPair;) + (IPKeyPair * _Nonnull)keyPair SWIFT_WARN_UNUSED_RESULT; ++ (void)setKeyPair:(IPKeyPair * _Nonnull)value; @end @@ -687,18 +697,14 @@ SWIFT_CLASS_NAMED("IProovErrorCode") @interface IPErrorCode : NSObject SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger networkError;) + (NSInteger)networkError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger encoderError;) -+ (NSInteger)encoderError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraError;) -+ (NSInteger)cameraError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger serverError;) + (NSInteger)serverError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger captureAlreadyActive;) + (NSInteger)captureAlreadyActive SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger lightingModelError;) -+ (NSInteger)lightingModelError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraPermissionDenied;) + (NSInteger)cameraPermissionDenied SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger unexpectedError;) ++ (NSInteger)unexpectedError SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -712,7 +718,7 @@ SWIFT_PROTOCOL("_TtP6iProov26IProovPresentationDelegate_") @class IPPublicKey; -SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("KeyPair") @interface IPKeyPair : NSObject @property (nonatomic, readonly, strong) IPPublicKey * _Nonnull publicKey; @property (nonatomic, readonly) BOOL isInSecureEnclave; @@ -723,33 +729,105 @@ SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov14NetworkOptions") -@interface NetworkOptions : NSObject -@property (nonatomic, copy) NSArray * _Nonnull certificates; -@property (nonatomic) BOOL certificatePinningDisabled; + + + +@class IPUIOptions; +@class IPNetworkOptions; +@class IPCaptureOptions; + +SWIFT_CLASS_NAMED("Options") +@interface IPOptions : NSObject +@property (nonatomic, strong) IPUIOptions * _Nonnull ui; +@property (nonatomic, strong) IPNetworkOptions * _Nonnull network; +@property (nonatomic, strong) IPCaptureOptions * _Nonnull capture; +/// Create Options from a JSON string representation ++ (IPOptions * _Nonnull)fromJson:(NSDictionary * _Nonnull)json SWIFT_WARN_UNUSED_RESULT; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +enum IPFilter : NSInteger; +@class NSBundle; +@class UIColor; +@class IPGenuinePresenceAssuranceUIOptions; +@class IPLivenessAssuranceUIOptions; + +SWIFT_CLASS_NAMED("UI") +@interface IPUIOptions : NSObject +@property (nonatomic) enum IPFilter filter; +@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; +@property (nonatomic, copy) NSString * _Nullable stringsTable; +@property (nonatomic, strong) UIColor * _Nonnull lineColor; +@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; +@property (nonatomic, copy) NSString * _Nullable title; +@property (nonatomic, copy) NSString * _Nonnull font; +@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; +@property (nonatomic, strong) UIImage * _Nullable logoImage; +@property (nonatomic, strong) IPGenuinePresenceAssuranceUIOptions * _Nonnull genuinePresenceAssurance; +@property (nonatomic, strong) IPLivenessAssuranceUIOptions * _Nonnull livenessAssurance; +@property (nonatomic, weak) id _Nullable presentationDelegate; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +@end + + +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceUIOptions : NSObject +@property (nonatomic) BOOL autoStartDisabled; +@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("LivenessAssurance") +@interface IPLivenessAssuranceUIOptions : NSObject +@property (nonatomic, strong) UIColor * _Nonnull primaryTintColor; +@property (nonatomic, strong) UIColor * _Nonnull secondaryTintColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("Network") +@interface IPNetworkOptions : NSObject +@property (nonatomic, copy) NSArray * _Nonnull certificates; @property (nonatomic) NSTimeInterval timeout; @property (nonatomic, copy) NSString * _Nonnull path; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +@class IPGenuinePresenceAssuranceCaptureOptions; +SWIFT_CLASS_NAMED("Capture") +@interface IPCaptureOptions : NSObject +@property (nonatomic, strong) IPGenuinePresenceAssuranceCaptureOptions * _Nonnull genuinePresenceAssurance; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end -@class UIOptions; - -SWIFT_CLASS("_TtC6iProov7Options") -@interface Options : NSObject -@property (nonatomic, strong) UIOptions * _Nonnull ui; -@property (nonatomic, strong) NetworkOptions * _Nonnull network; -@property (nonatomic, strong) CaptureOptions * _Nonnull capture; -/// Create Options from a JSON string representation -+ (Options * _Nonnull)fromJsonString:(NSString * _Nonnull)jsonString SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceCaptureOptions : NSObject +@property (nonatomic) CGFloat maxYaw; +@property (nonatomic) CGFloat maxRoll; +@property (nonatomic) CGFloat maxPitch; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +typedef SWIFT_ENUM_NAMED(NSInteger, IPFilter, "Filter", open) { + IPFilterClassic = 0, + IPFilterShaded = 1, + IPFilterVibrant = 2, +}; -SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) + +SWIFT_CLASS_NAMED("PublicKey") @interface IPPublicKey : NSObject @property (nonatomic, readonly) SecKeyRef _Nonnull key; @property (nonatomic, readonly, copy) NSString * _Nonnull pem; @@ -760,8 +838,8 @@ SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov13SuccessResult") -@interface SuccessResult : NSObject +SWIFT_CLASS_NAMED("SuccessResult") +@interface IPSuccessResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, strong) UIImage * _Nullable frame; - (nonnull instancetype)init SWIFT_UNAVAILABLE; @@ -778,38 +856,6 @@ SWIFT_CLASS("_TtC6iProov13SuccessResult") -@class NSBundle; -@class UIColor; - -SWIFT_CLASS("_TtC6iProov9UIOptions") -@interface UIOptions : NSObject -@property (nonatomic) BOOL autoStartDisabled; -@property (nonatomic) enum Filter filter; -@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; -@property (nonatomic, copy) NSString * _Nullable stringsTable; -@property (nonatomic, strong) UIColor * _Nonnull lineColor; -@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull loadingTintColor SWIFT_DEPRECATED; -@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessScanningTintColor; -@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; -@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; -@property (nonatomic, copy) NSString * _Nullable title; -@property (nonatomic, copy) NSString * _Nonnull font; -@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; -@property (nonatomic, strong) UIImage * _Nullable logoImage; -@property (nonatomic) BOOL scanLineDisabled; -@property (nonatomic, weak) id _Nullable presentationDelegate; -@property (nonatomic) BOOL useLegacyConnectingUI SWIFT_DEPRECATED; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end @@ -1047,19 +1093,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -SWIFT_CLASS("_TtC6iProov14CaptureOptions") -@interface CaptureOptions : NSObject -@property (nonatomic) CGFloat maxYaw; -@property (nonatomic) CGFloat maxRoll; -@property (nonatomic) CGFloat maxPitch; -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - - @class UIImage; -SWIFT_CLASS("_TtC6iProov13FailureResult") -@interface FailureResult : NSObject +SWIFT_CLASS_NAMED("FailureResult") +@interface IPFailureResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, copy) NSString * _Nonnull reason; @property (nonatomic, readonly, copy) NSString * _Nonnull feedbackCode; @@ -1068,11 +1105,6 @@ SWIFT_CLASS("_TtC6iProov13FailureResult") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -typedef SWIFT_ENUM(NSInteger, Filter, open) { - FilterClassic = 0, - FilterShaded = 1, - FilterVibrant = 2, -}; SWIFT_CLASS_NAMED("IProov") @@ -1081,19 +1113,20 @@ SWIFT_CLASS_NAMED("IProov") + (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); @end -@class Options; -@class SuccessResult; +@class IPOptions; +@class IPSuccessResult; @class NSError; @interface IProov (SWIFT_EXTENSION(iProov)) -+ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(Options * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(SuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(FailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; ++ (void)launchWithStreamingURL:(NSString * _Nonnull)streamingURL token:(NSString * _Nonnull)token options:(IPOptions * _Nonnull)options connecting:(void (^ _Nonnull)(void))connecting connected:(void (^ _Nonnull)(void))connected processing:(void (^ _Nonnull)(double, NSString * _Nonnull))processing success:(void (^ _Nonnull)(IPSuccessResult * _Nonnull))success cancelled:(void (^ _Nonnull)(void))cancelled failure:(void (^ _Nonnull)(IPFailureResult * _Nonnull))failure error:(void (^ _Nonnull)(NSError * _Nonnull))error; @end @class IPKeyPair; @interface IProov (SWIFT_EXTENSION(iProov)) -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) IPKeyPair * _Nonnull keyPair SWIFT_AVAILABILITY(ios,introduced=10.0);) +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, strong) IPKeyPair * _Nonnull keyPair;) + (IPKeyPair * _Nonnull)keyPair SWIFT_WARN_UNUSED_RESULT; ++ (void)setKeyPair:(IPKeyPair * _Nonnull)value; @end @@ -1101,18 +1134,14 @@ SWIFT_CLASS_NAMED("IProovErrorCode") @interface IPErrorCode : NSObject SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger networkError;) + (NSInteger)networkError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger encoderError;) -+ (NSInteger)encoderError SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraError;) -+ (NSInteger)cameraError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger serverError;) + (NSInteger)serverError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger captureAlreadyActive;) + (NSInteger)captureAlreadyActive SWIFT_WARN_UNUSED_RESULT; -SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger lightingModelError;) -+ (NSInteger)lightingModelError SWIFT_WARN_UNUSED_RESULT; SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger cameraPermissionDenied;) + (NSInteger)cameraPermissionDenied SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly) NSInteger unexpectedError;) ++ (NSInteger)unexpectedError SWIFT_WARN_UNUSED_RESULT; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -1126,7 +1155,7 @@ SWIFT_PROTOCOL("_TtP6iProov26IProovPresentationDelegate_") @class IPPublicKey; -SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("KeyPair") @interface IPKeyPair : NSObject @property (nonatomic, readonly, strong) IPPublicKey * _Nonnull publicKey; @property (nonatomic, readonly) BOOL isInSecureEnclave; @@ -1137,33 +1166,105 @@ SWIFT_CLASS_NAMED("KeyPair") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov14NetworkOptions") -@interface NetworkOptions : NSObject -@property (nonatomic, copy) NSArray * _Nonnull certificates; -@property (nonatomic) BOOL certificatePinningDisabled; + + + +@class IPUIOptions; +@class IPNetworkOptions; +@class IPCaptureOptions; + +SWIFT_CLASS_NAMED("Options") +@interface IPOptions : NSObject +@property (nonatomic, strong) IPUIOptions * _Nonnull ui; +@property (nonatomic, strong) IPNetworkOptions * _Nonnull network; +@property (nonatomic, strong) IPCaptureOptions * _Nonnull capture; +/// Create Options from a JSON string representation ++ (IPOptions * _Nonnull)fromJson:(NSDictionary * _Nonnull)json SWIFT_WARN_UNUSED_RESULT; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +enum IPFilter : NSInteger; +@class NSBundle; +@class UIColor; +@class IPGenuinePresenceAssuranceUIOptions; +@class IPLivenessAssuranceUIOptions; + +SWIFT_CLASS_NAMED("UI") +@interface IPUIOptions : NSObject +@property (nonatomic) enum IPFilter filter; +@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; +@property (nonatomic, copy) NSString * _Nullable stringsTable; +@property (nonatomic, strong) UIColor * _Nonnull lineColor; +@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; +@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; +@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; +@property (nonatomic, copy) NSString * _Nullable title; +@property (nonatomic, copy) NSString * _Nonnull font; +@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; +@property (nonatomic, strong) UIImage * _Nullable logoImage; +@property (nonatomic, strong) IPGenuinePresenceAssuranceUIOptions * _Nonnull genuinePresenceAssurance; +@property (nonatomic, strong) IPLivenessAssuranceUIOptions * _Nonnull livenessAssurance; +@property (nonatomic, weak) id _Nullable presentationDelegate; +- (nonnull instancetype)init SWIFT_UNAVAILABLE; ++ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); +@end + + +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceUIOptions : NSObject +@property (nonatomic) BOOL autoStartDisabled; +@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; +@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("LivenessAssurance") +@interface IPLivenessAssuranceUIOptions : NSObject +@property (nonatomic, strong) UIColor * _Nonnull primaryTintColor; +@property (nonatomic, strong) UIColor * _Nonnull secondaryTintColor; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + + +SWIFT_CLASS_NAMED("Network") +@interface IPNetworkOptions : NSObject +@property (nonatomic, copy) NSArray * _Nonnull certificates; @property (nonatomic) NSTimeInterval timeout; @property (nonatomic, copy) NSString * _Nonnull path; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +@class IPGenuinePresenceAssuranceCaptureOptions; +SWIFT_CLASS_NAMED("Capture") +@interface IPCaptureOptions : NSObject +@property (nonatomic, strong) IPGenuinePresenceAssuranceCaptureOptions * _Nonnull genuinePresenceAssurance; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end -@class UIOptions; - -SWIFT_CLASS("_TtC6iProov7Options") -@interface Options : NSObject -@property (nonatomic, strong) UIOptions * _Nonnull ui; -@property (nonatomic, strong) NetworkOptions * _Nonnull network; -@property (nonatomic, strong) CaptureOptions * _Nonnull capture; -/// Create Options from a JSON string representation -+ (Options * _Nonnull)fromJsonString:(NSString * _Nonnull)jsonString SWIFT_WARN_UNUSED_RESULT; +SWIFT_CLASS_NAMED("GenuinePresenceAssurance") +@interface IPGenuinePresenceAssuranceCaptureOptions : NSObject +@property (nonatomic) CGFloat maxYaw; +@property (nonatomic) CGFloat maxRoll; +@property (nonatomic) CGFloat maxPitch; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end +typedef SWIFT_ENUM_NAMED(NSInteger, IPFilter, "Filter", open) { + IPFilterClassic = 0, + IPFilterShaded = 1, + IPFilterVibrant = 2, +}; + -SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) +SWIFT_CLASS_NAMED("PublicKey") @interface IPPublicKey : NSObject @property (nonatomic, readonly) SecKeyRef _Nonnull key; @property (nonatomic, readonly, copy) NSString * _Nonnull pem; @@ -1174,8 +1275,8 @@ SWIFT_CLASS_NAMED("PublicKey") SWIFT_AVAILABILITY(ios,introduced=10.0) -SWIFT_CLASS("_TtC6iProov13SuccessResult") -@interface SuccessResult : NSObject +SWIFT_CLASS_NAMED("SuccessResult") +@interface IPSuccessResult : NSObject @property (nonatomic, readonly, copy) NSString * _Nonnull token; @property (nonatomic, readonly, strong) UIImage * _Nullable frame; - (nonnull instancetype)init SWIFT_UNAVAILABLE; @@ -1192,38 +1293,6 @@ SWIFT_CLASS("_TtC6iProov13SuccessResult") -@class NSBundle; -@class UIColor; - -SWIFT_CLASS("_TtC6iProov9UIOptions") -@interface UIOptions : NSObject -@property (nonatomic) BOOL autoStartDisabled; -@property (nonatomic) enum Filter filter; -@property (nonatomic, strong) NSBundle * _Nullable stringsBundle; -@property (nonatomic, copy) NSString * _Nullable stringsTable; -@property (nonatomic, strong) UIColor * _Nonnull lineColor; -@property (nonatomic, strong) UIColor * _Nonnull backgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull footerBackgroundColor; -@property (nonatomic, strong) UIColor * _Nonnull headerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull footerTextColor; -@property (nonatomic, strong) UIColor * _Nonnull loadingTintColor SWIFT_DEPRECATED; -@property (nonatomic, strong) UIColor * _Nonnull notReadyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull readyTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessTintColor; -@property (nonatomic, strong) UIColor * _Nonnull livenessScanningTintColor; -@property (nonatomic, strong) UIColor * _Nonnull closeButtonTintColor; -@property (nonatomic, strong) UIColor * _Nonnull progressBarColor; -@property (nonatomic, copy) NSString * _Nullable title; -@property (nonatomic, copy) NSString * _Nonnull font; -@property (nonatomic, strong) UIImage * _Nonnull closeButtonImage; -@property (nonatomic, strong) UIImage * _Nullable logoImage; -@property (nonatomic) BOOL scanLineDisabled; -@property (nonatomic, weak) id _Nullable presentationDelegate; -@property (nonatomic) BOOL useLegacyConnectingUI SWIFT_DEPRECATED; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Info.plist b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Info.plist index 8b02da6..a2fb208 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Info.plist and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Info.plist differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftdoc index 282d45a..830257f 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 01412ad..bab95ff 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target arm64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc index 282d45a..830257f 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface index 01412ad..bab95ff 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/arm64.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target arm64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target arm64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftdoc index 2f265b2..655d61c 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftinterface index 5e996ae..27b82b4 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386-apple-ios-simulator.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target i386-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftdoc index 2f265b2..655d61c 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftinterface index 5e996ae..27b82b4 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/i386.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target i386-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target i386-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 243a0c6..cd2f6b5 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 1531c46..ac17259 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target x86_64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftdoc b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftdoc index 243a0c6..cd2f6b5 100644 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftdoc and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftdoc differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftinterface b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftinterface index 1531c46..ac17259 100644 --- a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftinterface +++ b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/Modules/iProov.swiftmodule/x86_64.swiftinterface @@ -1,18 +1,18 @@ // swift-interface-format-version: 1.0 // swift-compiler-version: Apple Swift version 5.3.2 (swiftlang-1200.0.45 clang-1200.0.32.28) -// swift-module-flags: -target x86_64-apple-ios9.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov +// swift-module-flags: -target x86_64-apple-ios10.0-simulator -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name iProov import AVFoundation import Accelerate import AudioToolbox -import CoreImage +import CommonCrypto import CoreMedia import CoreMotion import CoreVideo import Dispatch import Foundation -import ImageIO import OpenGLES import QuartzCore +import Security import SocketIO import Starscream import Swift @@ -29,23 +29,19 @@ extension CGRect : Swift.CustomDebugStringConvertible { } @_inheritsConvenienceInitializers @objc(IPErrorCode) public class IProovErrorCode : ObjectiveC.NSObject { @objc public static let networkError: Swift.Int - @objc public static let encoderError: Swift.Int - @objc public static let cameraError: Swift.Int @objc public static let serverError: Swift.Int @objc public static let captureAlreadyActive: Swift.Int - @objc public static let lightingModelError: Swift.Int @objc public static let cameraPermissionDenied: Swift.Int + @objc public static let unexpectedError: Swift.Int @objc deinit @objc override dynamic public init() } public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { case captureAlreadyActive case networkError(Swift.String?) - case encoderError(code: Swift.Int32?) - case lightingModelError - case cameraError(Swift.String?) case cameraPermissionDenied case serverError(Swift.String?) + case unexpectedError(Swift.String) public var errorCode: Swift.Int { get } @@ -58,6 +54,12 @@ public enum IProovError : Foundation.LocalizedError, Foundation.CustomNSError { public var errorDescription: Swift.String? { get } + public var localizedTitle: Swift.String { + get + } + public var localizedMessage: Swift.String? { + get + } } @objc public protocol IProovPresentationDelegate : AnyObject { @objc func present(iProovViewController: UIKit.UIViewController, completion: (() -> Swift.Void)?) @@ -71,70 +73,78 @@ extension IProov { @available(swift, obsoleted: 1.0) @objc public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options, connecting: @escaping () -> Swift.Void, connected: @escaping () -> Swift.Void, processing: @escaping (Swift.Double, Swift.String) -> Swift.Void, success: @escaping (iProov.SuccessResult) -> Swift.Void, cancelled: @escaping () -> Swift.Void, failure: @escaping (iProov.FailureResult) -> Swift.Void, error: @escaping (Foundation.NSError) -> Swift.Void) } -@_inheritsConvenienceInitializers @objc public class Options : ObjectiveC.NSObject { - @objc public var ui: iProov.UIOptions - @objc public var network: iProov.NetworkOptions - @objc public var capture: iProov.CaptureOptions - @objc public static func from(jsonString: Swift.String) -> iProov.Options - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class UIOptions : ObjectiveC.NSObject { - @objc public var autoStartDisabled: Swift.Bool - @objc public var filter: iProov.Filter - @objc public var stringsBundle: Foundation.Bundle? - @objc public var stringsTable: Swift.String? - @objc public var lineColor: UIKit.UIColor - @objc public var backgroundColor: UIKit.UIColor - @objc public var headerBackgroundColor: UIKit.UIColor - @objc public var footerBackgroundColor: UIKit.UIColor - @objc public var headerTextColor: UIKit.UIColor - @objc public var footerTextColor: UIKit.UIColor - @available(*, deprecated) - @objc public var loadingTintColor: UIKit.UIColor - @objc public var notReadyTintColor: UIKit.UIColor - @objc public var readyTintColor: UIKit.UIColor - @objc public var livenessTintColor: UIKit.UIColor - @objc public var livenessScanningTintColor: UIKit.UIColor - @objc public var closeButtonTintColor: UIKit.UIColor - @objc public var progressBarColor: UIKit.UIColor - @objc public var title: Swift.String? - @objc public var font: Swift.String - @objc public var closeButtonImage: UIKit.UIImage - @objc public var logoImage: UIKit.UIImage? - @objc public var scanLineDisabled: Swift.Bool - @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? - @available(*, deprecated) - @objc public var useLegacyConnectingUI: Swift.Bool - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class NetworkOptions : ObjectiveC.NSObject { - @objc public var certificates: [Swift.String] - @objc public var certificatePinningDisabled: Swift.Bool - @objc public var timeout: Swift.Double - @objc public var path: Swift.String - @objc override dynamic public init() - @objc deinit -} -@_inheritsConvenienceInitializers @objc public class CaptureOptions : ObjectiveC.NSObject { - @objc public var maxYaw: CoreGraphics.CGFloat - @objc public var maxRoll: CoreGraphics.CGFloat - @objc public var maxPitch: CoreGraphics.CGFloat +@_inheritsConvenienceInitializers @objc(IPOptions) public class Options : ObjectiveC.NSObject { + @objc public var ui: iProov.Options.UI + @objc public var network: iProov.Options.Network + @objc public var capture: iProov.Options.Capture + @objc public static func from(json: [Swift.String : Any]) -> iProov.Options + @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc(IPUIOptions) public class UI : ObjectiveC.NSObject { + @objc public var filter: iProov.Options.Filter + @objc public var stringsBundle: Foundation.Bundle? + @objc public var stringsTable: Swift.String? + @objc public var lineColor: UIKit.UIColor + @objc public var backgroundColor: UIKit.UIColor + @objc public var headerBackgroundColor: UIKit.UIColor + @objc public var footerBackgroundColor: UIKit.UIColor + @objc public var headerTextColor: UIKit.UIColor + @objc public var footerTextColor: UIKit.UIColor + @objc public var closeButtonTintColor: UIKit.UIColor + @objc public var title: Swift.String? + @objc public var font: Swift.String + @objc public var closeButtonImage: UIKit.UIImage + @objc public var logoImage: UIKit.UIImage? + @objc public var genuinePresenceAssurance: iProov.Options.UI.GenuinePresenceAssurance + @objc public var livenessAssurance: iProov.Options.UI.LivenessAssurance + @objc weak public var presentationDelegate: iProov.IProovPresentationDelegate? + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceUIOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var autoStartDisabled: Swift.Bool + @objc public var notReadyTintColor: UIKit.UIColor + @objc public var readyTintColor: UIKit.UIColor + @objc public var progressBarColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPLivenessAssuranceUIOptions) public class LivenessAssurance : ObjectiveC.NSObject { + @objc public var primaryTintColor: UIKit.UIColor + @objc public var secondaryTintColor: UIKit.UIColor + @objc override dynamic public init() + @objc deinit + } + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPNetworkOptions) public class Network : ObjectiveC.NSObject { + @objc public var certificates: [Any] + @objc public var timeout: Swift.Double + @objc public var path: Swift.String + @objc override dynamic public init() + @objc deinit + } + @_inheritsConvenienceInitializers @objc(IPCaptureOptions) public class Capture : ObjectiveC.NSObject { + @_inheritsConvenienceInitializers @objc(IPGenuinePresenceAssuranceCaptureOptions) public class GenuinePresenceAssurance : ObjectiveC.NSObject { + @objc public var maxYaw: CoreGraphics.CGFloat + @objc public var maxRoll: CoreGraphics.CGFloat + @objc public var maxPitch: CoreGraphics.CGFloat + @objc override dynamic public init() + @objc deinit + } + @objc public var genuinePresenceAssurance: iProov.Options.Capture.GenuinePresenceAssurance + @objc override dynamic public init() + @objc deinit + } + @objc(IPFilter) public enum Filter : Swift.Int { + case classic, shaded, vibrant + public typealias RawValue = Swift.Int + public init?(rawValue: Swift.Int) + public var rawValue: Swift.Int { + get + } + } @objc override dynamic public init() @objc deinit } -@objc public enum Filter : Swift.Int { - case classic, shaded, vibrant - public typealias RawValue = Swift.Int - public init?(rawValue: Swift.Int) - public var rawValue: Swift.Int { - get - } -} infix operator ?= : AssignmentPrecedence infix operator --> : AdditionPrecedence -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPPublicKey) public class PublicKey : ObjectiveC.NSObject { @objc final public let key: Security.SecKey @objc public var pem: Swift.String { @objc get @@ -145,8 +155,7 @@ infix operator --> : AdditionPrecedence @objc deinit @objc override dynamic public init() } -@_hasMissingDesignatedInitializers @available(iOS 10.0, *) -@objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPKeyPair) public class KeyPair : ObjectiveC.NSObject { @objc public var publicKey: iProov.PublicKey { @objc get } @@ -158,13 +167,13 @@ infix operator --> : AdditionPrecedence @objc override dynamic public init() } public typealias Callback = (iProov.Status) -> Swift.Void -@_hasMissingDesignatedInitializers @objc public class SuccessResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPSuccessResult) public class SuccessResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let frame: UIKit.UIImage? @objc override dynamic public init() @objc deinit } -@_hasMissingDesignatedInitializers @objc public class FailureResult : ObjectiveC.NSObject { +@_hasMissingDesignatedInitializers @objc(IPFailureResult) public class FailureResult : ObjectiveC.NSObject { @objc final public let token: Swift.String @objc final public let reason: Swift.String @objc final public let feedbackCode: Swift.String @@ -186,14 +195,34 @@ public enum Status { } extension IProov { public static func launch(streamingURL: Swift.String, token: Swift.String, options: iProov.Options = Options(), callback: @escaping iProov.Callback) - @available(iOS 10.0, *) - @objc public static var keyPair: iProov.KeyPair { - @objc get - } + @objc public static var keyPair: iProov.KeyPair +} +public protocol SSLTrustValidator { + func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool +} +open class SSLCert { + public init(data: Foundation.Data) + public init(key: Security.SecKey) + @objc deinit +} +open class SSLSecurity : iProov.SSLTrustValidator { + public var validatedDN: Swift.Bool + public var validateEntireChain: Swift.Bool + convenience public init(usePublicKeys: Swift.Bool = false) + public init(certs: [iProov.SSLCert], usePublicKeys: Swift.Bool) + open func isValid(_ trust: Security.SecTrust, domain: Swift.String?) -> Swift.Bool + public func extractPublicKey(_ data: Foundation.Data) -> Security.SecKey? + public func extractPublicKey(_ cert: Security.SecCertificate, policy: Security.SecPolicy) -> Security.SecKey? + public func certificateChain(_ trust: Security.SecTrust) -> [Foundation.Data] + public func publicKeyChain(_ trust: Security.SecTrust) -> [Security.SecKey] + @objc deinit +} +extension SSLSecurity : Starscream.CertificatePinning { + public func evaluateTrust(trust: Security.SecTrust, domain: Swift.String?, completion: (Starscream.PinningState) -> Swift.Void) } extension UIImage { convenience public init?(pixelBuffer: CoreVideo.CVPixelBuffer) } -extension iProov.Filter : Swift.Equatable {} -extension iProov.Filter : Swift.Hashable {} -extension iProov.Filter : Swift.RawRepresentable {} +extension iProov.Options.Filter : Swift.Equatable {} +extension iProov.Options.Filter : Swift.Hashable {} +extension iProov.Options.Filter : Swift.RawRepresentable {} diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov index 859fdb3..e3fd1c2 100755 Binary files a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov differ diff --git a/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov.plist b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov.plist new file mode 100644 index 0000000..7d186fc Binary files /dev/null and b/EmbeddedFrameworks/iProov.xcframework/ios-arm64_i386_x86_64-simulator/iProov.framework/iProov.plist differ diff --git a/MigrationDetails.md b/MigrationDetails.md new file mode 100644 index 0000000..32abfc3 --- /dev/null +++ b/MigrationDetails.md @@ -0,0 +1,134 @@ +# Migration Details + +---------- + +## v11.5.5 + +### Important information about upgrading from iOS SDK version 11.5.x to version 11.5.5+ + +- The callback in FaceCaptureController now receives a FaceCaptureResult instead of a UIImage. The former holds an UImage and its corresponding JPEG data. + +- AcuantLivenessRequest now holds the image as JPEG data instead of a UIImage. + +- FacialMatchData changed its properties name to faceOneData and faceTwoData. Both are of type Data instead of UIImage. + +- In HGLivenessDelegate, liveFaceCapture function now receives a HGLivenessResult instead of a UIImage. The former holds the UIImage and its corresponding JPEG data. + +---------- + +## v11.5.1 + +### Important information about upgrading from iOS SDK version 11.4.x to version 11.5.1+ + +To support Xcode 12.5, Acuant iOS SDK v11 is now distributed through XCFramework files instead of Framework files. To work around a bug in Swift, several class names have changed. Refer to the following list and update your implementation accordingly: + +- AcuantCameraOptions -> CameraOptions + +- AcuantCameraMetaData -> CameraMetaData + +- AcuantCameraTextView -> CameraTextView + +- AcuantDocumentProcessing -> DocumentProcessing + +- AcuantEchipReader -> EchipReader + +- IAcuantEchipReader -> IEchipReader + +- AcuantFaceCaptureController -> FaceCaptureController + +- FaceAcuantCameraOptions -> FaceCameraOptions + +- AcuantFaceMatch -> FaceMatch + +- AcuantHGLiveness -> HGLiveness + +- AcuantHGLivenessDelegate -> HGLivenessDelegate + +- AcuantImagePreparation -> ImagePreparation + +- AcuantImagePreparationPackage -> ImagePreparationPackage + +- AcuantIPLiveness -> IPLiveness + +- AcuantPassiveLiveness -> PassiveLiveness + +- IAcuantPassiveLivenessService -> IPassiveLivenessService + +- AcuantPassiveLivenessService -> PassiveLivenessService + +Users of **IPLiveness** must implement two new callbacks: livenessTestConnecting() and livenessTestConnected(). This will allow the user to display any desired form of connecting message and the IPLiveness UI will only appear when it is fully ready for capture. In addition, users of IPLiveness might need to review localization as some strings have changed. + +---------- + +## v11.4.0 + +### Important information about upgrading from iOS SDK version 11.3.x or earlier to version 11.4.x using CocoaPods + +The Acuant iOS SDK v11 now has a minimum target of iOS 13.2. Each module has been divided into subpods. + +- To use the entire SDK, add the parent pod AcuantiOSSDKV11: + + ``` pod 'AcuantiOSSDKV11' ``` + +The **minimum target is iOS 11** unless stated otherwise. + +- To include a specific pod in the SDK: + + | ``` pod 'AcuantiOSSDKV11/AcuantCamera' ``` | | + | ----------- | ----------- | + | Use document camera only | ``` pod 'AcuantiOSSDKV11/AcuantCamera/Document' ``` | + | Use passport MRZ camera only | ``` pod 'AcuantiOSSDKV11/AcuantCamera/Mrz' ``` | + | Import library in Swift | ``` import AcuantiOSSDKV11 ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantImagePreparation' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantImagePreparation ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantFaceCapture' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantFaceCapture ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantEchipReader' ``` | | + | ----------- | ----------- | + | The **minimum target is iOS 13.2** | | + | Import library in Swift | ``` import AcuantEchipReader ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantHGLiveness' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantHGLiveness ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantIPLiveness' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantIPLiveness ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantPassiveLiveness' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantPassiveLiveness ``` | + + | ``` pod 'AcuantiOSSDKV11/AcuantDocumentProcessing' ``` | | + | ----------- | ----------- | + | Import library in Swift | ``` import AcuantDocumentProcessing ``` | + +### Aditional notes + +- Refactored the SDK initialization. You will need to pass in packages to the ``` AcuantInitializer ``` (``` IAcuantInitializer ```). + + - The package that can be initialized is ``` AcuantImagePreparation ``` + + - (```AcuantImagePreparationPackage```) and ```AcuantEchipReader``` (```AcuantEchipPackage```) + +- ``` AcuantCamera ``` + + - Added MRZ capture + + - Depends on iOS Tesseract + + - If you do not need the new MRZ capture, you can exclude adding the dependency and remove the “Mrz” directory from the ``` AcuantCamera ``` project + +- ``` AcuantEchipReader ``` + + - Requires iOS 13.2 + + - If you want to add the ``` AcuantEchipReader ``` to your project, you have to upgrade your application target to iOS version 13.2 or later. + + - Remove “NFC Data Exchange” Item in entitlement file diff --git a/README.md b/README.md index d30f668..5df9741 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Acuant iOS SDK v11.5.4 +# Acuant iOS SDK v11.5.5 -**October 2021** +**March 2022** See [https://github.com/Acuant/iOSSDKV11/releases](https://github.com/Acuant/iOSSDKV11/releases) for release notes. @@ -21,9 +21,9 @@ This document provides detailed information about the Acuant iOS SDK. The Acuant ---------- -## Updating to 11.5.1+ +## Updating to 11.5.5+ -Please see the provided [migration details document](iOSmigrationdetails.pdf) for information about updating to 11.5.1+ +Please see the provided [Migration Details](MigrationDetails.md) for information about updating to 11.5.5+ ---------- @@ -87,17 +87,17 @@ The SDK includes the following modules: 1. Add the following dependent embedded frameworks: - - **AcuantFaceCapture** - - **AcuantPassiveLiveness** - - **AcuantCommon** - - **AcuantImagePreparation** - - **AcuantDocumentProcessing** - - **AcuantHGLiveness** - - **AcuantFaceMatch** - - **AcuantEchipReader** - - **AcuantCamera** + - **AcuantFaceCapture** + - **AcuantPassiveLiveness** + - **AcuantCommon** + - **AcuantImagePreparation** + - **AcuantDocumentProcessing** + - **AcuantHGLiveness** + - **AcuantFaceMatch** + - **AcuantEchipReader** + - **AcuantCamera** - TesseractOCR.framework - - **AcuantIPLiveness** + - **AcuantIPLiveness** - iProov.xcframework - SocketIO.xcframework - Starscream.xcframework @@ -116,7 +116,7 @@ The SDK includes the following modules: /usr/local/bin/carthage copy-frameworks -1. Create new inputFileList.xcfilelist and outputFileList.xcfilelist. Add necessary frameworks to both files. Example in repository. +1. Create new inputFileList.xcfilelist and outputFileList.xcfilelist. Add only TesseractOCR.framework to both files. Do not add XCFrameworks. There's an example in repository. 1. Add the .xcfilelist to your run script. @@ -131,7 +131,9 @@ The SDK includes the following modules: 1. Add the following in the podfile to get **all** the modules: platform :ios, '11' - pod 'AcuantiOSSDKV11', '~> 11.5.4' #for all packages + use_frameworks! # important + + pod 'AcuantiOSSDKV11', '~> 11.5.5' #for all packages Alternatively, use the following to add **independent** modules in the podfile: @@ -797,9 +799,9 @@ After you capture a document image and completed crop, it can be processed using let controller = FaceCaptureController() controller.options = options controller.callback = { [weak self] - (image: UIImage?) in + (result: FaceCaptureResult?) in - if(image == nil){ + if (result == nil) { //user canceled } @@ -838,20 +840,20 @@ The following may significantly increase errors or false results: **Note:** The use of fish-eye lenses is not supported by this API. -1. Get Passive Liveness result with UIImage: +1. Get Passive Liveness result with Data: //liveness request - class AcuantLivenessRequest{ - public let image: UIImage - public init(image: UIImage) + class AcuantLivenessRequest { + public let jpegData: Data + public init(jpegData: Data) } //liveness response - class AcuantLivenessResponse{ + class AcuantLivenessResponse { public let score: Int public let result: AcuantLivenessAssessment - public enum AcuantLivenessAssessment: String{ + public enum AcuantLivenessAssessment: String { case Error case PoorQuality case Live @@ -860,12 +862,12 @@ The following may significantly increase errors or false results: } //liveness response - class AcuantLivenessError{ + class AcuantLivenessError { public let errorCode: AcuantLivenessErrorCode? public let description: String? - public enum AcuantLivenessErrorCode: String{ + public enum AcuantLivenessErrorCode: String { case Unknown case FaceTooClose case FaceNotFound @@ -882,7 +884,7 @@ The following may significantly increase errors or false results: } //example - PassiveLiveness.postLiveness(request: AcuantLivenessRequest(image: image)){ [weak self] + PassiveLiveness.postLiveness(request: AcuantLivenessRequest(jpegData: jpegData)) { [weak self] (result: AcuantLivenessResponse?, error: AcuantLivenessError?) in //response } @@ -1008,15 +1010,15 @@ The following is a list of dependencies: This module is used to match two facial images: - public class func processFacialMatch(facialData : FacialMatchData, delegate : FacialMatchDelegate) + public class func processFacialMatch(facialData: FacialMatchData, delegate: FacialMatchDelegate) public protocol FacialMatchDelegate { - func facialMatchFinished(result:FacialMatchResult?) + func facialMatchFinished(result: FacialMatchResult?) } - public class FacialMatchData{ - public var faceImageOne : UIImage // Facial image from ID Card (image gets compressed by 80%) - public var faceImageTwo : UIImage // Facial image from selfie capture during liveness check (image gets compressed by 80%) + public class FacialMatchData { + public var faceOneData: Data // Facial image from ID Card (image gets compressed by 80%) + public var faceTwoData: Data // Facial image from selfie capture during liveness check (image gets compressed by 80%) } ---------- @@ -1136,6 +1138,7 @@ This module is used to match two facial images: public var isRetrying: Bool = false public var authenticationSensitivity: AuthenticationSensitivity = AuthenticationSensitivity.Normal public var tamperSensitivity: TamperSensitivity = TamperSensitivity.Normal + public var countryCode: String? } ### AcuantPassportModel (used in eChip workflow) @@ -1183,7 +1186,7 @@ Acuant does not provide obfuscation tools, however several third-party tools, in ------------------------------------------------------------- -**Copyright 2021 Acuant Inc. All rights reserved.** +**Copyright 2022 Acuant Inc. All rights reserved.** This document contains proprietary and confidential information and creative works owned by Acuant and its respective licensors, if any. Any use, copying, publication, distribution, display, modification, or transmission of such technology, in whole or in part, in any form or by any means, without the prior express written permission of Acuant is strictly prohibited. Except where expressly provided by Acuant in writing, possession of this information shall not be construed to confer any license or rights under any Acuant intellectual property rights, whether by estoppel, implication, or otherwise. diff --git a/SampleApp/SampleApp/FaceLivenessCameraController.swift b/SampleApp/SampleApp/FaceLivenessCameraController.swift index fbfcfa3..db9cd91 100644 --- a/SampleApp/SampleApp/FaceLivenessCameraController.swift +++ b/SampleApp/SampleApp/FaceLivenessCameraController.swift @@ -217,13 +217,14 @@ class FaceLivenessCameraController: UIViewController, AcuantHGLiveFaceCaptureDel faceOval?.isHidden = false faceOval?.path = UIBezierPath(ovalIn: faceRect).cgPath - if faceDetails.isLiveFace, let image = faceDetails.image, !captured { + if faceDetails.isLiveFace, let image = faceDetails.image, !captured, + let resizedImage = ImagePreparation.resize(image: image, + targetWidth: getTargetWidth(width: Int(image.size.width), height: Int(image.size.height))), + let signedImageData = ImagePreparation.sign(image: resizedImage) { captured = true - faceDetails.image = ImagePreparation.resize(image: image, - targetWidth: getTargetWidth(width: Int(image.size.width), - height: Int(image.size.height))) + faceDetails.image = resizedImage navigationController?.popViewController(animated: true) - delegate?.liveFaceCaptured(image: image) + delegate?.liveFaceCaptured(result: HGLivenessResult(image: resizedImage, jpegData: signedImageData)) } } else if liveFaceDetails == nil || liveFaceDetails?.faceRect == nil { faceOval?.isHidden = true diff --git a/SampleApp/SampleApp/RootViewController.swift b/SampleApp/SampleApp/RootViewController.swift index e46a176..bf3a7f4 100644 --- a/SampleApp/SampleApp/RootViewController.swift +++ b/SampleApp/SampleApp/RootViewController.swift @@ -147,7 +147,7 @@ class RootViewController: UIViewController{ packages.append(AcuantEchipPackage()) } - let task = initalizer.initialize(packages:packages){ [weak self] + let _ = initalizer.initialize(packages:packages){ [weak self] error in DispatchQueue.main.async { @@ -157,18 +157,17 @@ class RootViewController: UIViewController{ self.mrzButton.isHidden = true } - if(!self.isKeyless){ - IPLiveness.getLivenessTestCredential(delegate: self) - } - else{ - self.hideProgressView() - self.medicalCardButton.isEnabled = true - self.idPassportButton.isEnabled = true - self.mrzButton.isEnabled = true - self.hideProgressView() - self.isInitialized = true - self.resetData() + if (Credential.authorization().ipLiveness) { + self.addEnhancedLiveness() } + + self.hideProgressView() + self.medicalCardButton.isEnabled = true + self.idPassportButton.isEnabled = true + self.mrzButton.isEnabled = true + self.isInitialized = true + self.resetData() + }else{ self.hideProgressView() self.medicalCardButton.isEnabled = true @@ -706,26 +705,6 @@ extension RootViewController:DeleteDelegate{ //IPLiveness - START ============ -extension RootViewController : LivenessTestCredentialDelegate{ - func livenessTestCredentialReceived(result:Bool){ - self.isInitialized = true - - DispatchQueue.main.async{ - self.hideProgressView() - self.medicalCardButton.isEnabled = true - self.idPassportButton.isEnabled = true - self.mrzButton.isEnabled = true - if(result){ - self.addEnhancedLiveness() - } - } - } - - func livenessTestCredentialReceiveFailed(error:AcuantError){ - self.hideProgressView() - CustomAlerts.displayError(message: "\(error.errorCode) : \(error.errorDescription)" ) - } -} extension RootViewController : LivenessSetupDelegate{ func livenessSetupSucceeded(result: LivenessSetupResult) { ipLivenessSetupResult = result @@ -734,7 +713,7 @@ extension RootViewController : LivenessSetupDelegate{ } func livenessSetupFailed(error: AcuantError) { - livenessTestFailed(error:error) + livenessTestFailed(error: error) } } @@ -744,6 +723,7 @@ extension RootViewController : LivenessTestDelegate{ IPLiveness.getLivenessTestResult(token: ipLivenessSetupResult!.token, userId: ipLivenessSetupResult!.userId, delegate: self) } else{ + print("Liveness test delegate failure") livenessTestFailed(error: AcuantError()) } } @@ -767,11 +747,12 @@ extension RootViewController : LivenessTestDelegate{ } func livenessTestCompletedWithError(error: AcuantError?) { - livenessTestFailed(error: AcuantError()) + livenessTestFailed(error: error ?? AcuantError()) } } extension RootViewController : LivenessTestResultDelegate{ + func livenessTestResultReceived(result: LivenessTestResult) { if(result.passedLivenessTest){ self.livenessString = "IP Liveness : true" @@ -780,15 +761,17 @@ extension RootViewController : LivenessTestResultDelegate{ self.livenessString = "IP Liveness : false" } self.faceCapturedImage = result.image - processFacialMatch(image: result.image) + if let jpegData = result.image?.jpegData(compressionQuality: 1.0) { + processFacialMatch(imageData: jpegData) + } - self.faceProcessingGroup.notify(queue: .main){ + self.faceProcessingGroup.notify(queue: .main) { self.showResultGroup.leave() } } func livenessTestResultReceiveFailed(error: AcuantError) { - livenessTestFailed(error:error) + livenessTestFailed(error: error) } func livenessTestFailed(error:AcuantError) { @@ -803,9 +786,9 @@ extension RootViewController : LivenessTestResultDelegate{ extension RootViewController { - private func processPassiveLiveness(image:UIImage){ + private func processPassiveLiveness(imageData: Data) { self.faceProcessingGroup.enter() - PassiveLiveness.postLiveness(request: AcuantLivenessRequest(image: image)){ [weak self] + PassiveLiveness.postLiveness(request: AcuantLivenessRequest(jpegData: imageData)) { [weak self] (result, error) in if(result != nil && (result?.result == AcuantLivenessAssessment.Live || result?.result == AcuantLivenessAssessment.NotLive)){ self?.livenessString = "Liveness : \(result!.result.rawValue)" @@ -820,17 +803,17 @@ extension RootViewController { public func showPassiveLiveness(){ DispatchQueue.main.async { let controller = FaceCaptureController() - controller.callback = { [weak self] - (image) in + controller.callback = { [weak self] faceCaptureResult in + guard let self = self else { return } - if(image != nil){ - self?.faceCapturedImage = image - self?.processPassiveLiveness(image: image!) - self?.processFacialMatch(image: image!) + if let result = faceCaptureResult { + self.faceCapturedImage = result.image + self.processPassiveLiveness(imageData: result.jpegData) + self.processFacialMatch(imageData: result.jpegData) } - self?.faceProcessingGroup.notify(queue: .main){ - self?.showResultGroup.leave() + self.faceProcessingGroup.notify(queue: .main){ + self.showResultGroup.leave() } } self.navigationController?.pushViewController(controller, animated: false) @@ -858,8 +841,9 @@ extension RootViewController { //Passive Liveness + FaceCapture - END ============ -//FaceMatch - START ============ -extension RootViewController : FacialMatchDelegate{ +//MARK: - FaceMatchDelegate + +extension RootViewController: FacialMatchDelegate { func facialMatchFinished(result: FacialMatchResult?) { self.faceProcessingGroup.leave() @@ -867,37 +851,33 @@ extension RootViewController : FacialMatchDelegate{ capturedFacialMatchResult = result } } - func processFacialMatch(image:UIImage?){ + + func processFacialMatch(imageData: Data) { self.faceProcessingGroup.enter() self.showProgressView(text: "Processing...") - self.getDataGroup.notify(queue: .main){ - if(self.capturedFaceImageUrl != nil && image != nil){ - // create the request - let url = URL(string: self.capturedFaceImageUrl!)! + self.getDataGroup.notify(queue: .main) { + if let capturedFaceImageUrl = self.capturedFaceImageUrl, + let url = URL(string: capturedFaceImageUrl) { + var request = URLRequest(url: url) request.httpMethod = "GET" request.setValue(Credential.getBasicAuthHeader()!, forHTTPHeaderField: "Authorization") - URLSession.shared.dataTask(with: request) { (data, response, error) in + URLSession.shared.dataTask(with: request) { data, response, error in let httpURLResponse = response as? HTTPURLResponse - if(httpURLResponse?.statusCode == 200){ - let downloadedImage = UIImage(data: data!) - - if(downloadedImage != nil){ - let facialMatchData = FacialMatchData(faceImageOne: downloadedImage!, faceImageTwo: image!) + if httpURLResponse?.statusCode == 200 { + if let downloadedImageData = data { + let facialMatchData = FacialMatchData(faceOneData: downloadedImageData, faceTwoData: imageData) FaceMatch.processFacialMatch(facialData: facialMatchData, delegate: self) - } - else{ + } else { self.faceProcessingGroup.leave() } - - }else { + } else { self.faceProcessingGroup.leave() - return } }.resume() - }else{ + } else { self.faceProcessingGroup.leave() DispatchQueue.main.async { @@ -907,7 +887,6 @@ extension RootViewController : FacialMatchDelegate{ } } } -//FaceMatch - END ============ // MARK: - MrzHelpViewControllerDelegate diff --git a/SampleApp/SampleApp/en.lproj/Localizable.strings b/SampleApp/SampleApp/en.lproj/Localizable.strings index cae8960..18c81cd 100644 --- a/SampleApp/SampleApp/en.lproj/Localizable.strings +++ b/SampleApp/SampleApp/en.lproj/Localizable.strings @@ -38,7 +38,6 @@ /* AcuantIPLiveness */ "IProov_LanguageFile" = "en-US"; -"IProov_PromptConnecting" = "Connecting…"; "IProov_PromptTapToBegin" = "Tap the screen to begin"; "IProov_PromptTooFar" = "Move closer"; "IProov_PromptTooBright" = "Go somewhere shadier"; @@ -74,14 +73,10 @@ "IProov_PromptPitchTooHigh" = "Hold the device at eye level"; "IProov_PromptPitchTooLow" = "Hold the device at eye level"; "IProov_ErrorNetwork" = "Network error"; -"IProov_ErrorEncoder" = "Encoder error"; -"IProov_ErrorCamera" = "Camera error"; "IProov_ErrorCameraPermissionDenied" = "Camera permission denied"; "IProov_ErrorCameraPermissionDeniedMessageIos" = "Please allow camera access for this app in iOS Settings"; "IProov_ErrorServer" = "Server error"; -"IProov_ErrorLightingModel" = "Lighting model error"; -"IProov_ErrorEncoderUnknownMessage" = "Unknown encoder error"; -"IProov_ErrorEncoderCodeMessage" = "Error code %@"; +"IProov_ErrorUnexpected" = "Unexpected error"; "IProov_ErrorCaptureAlreadyActive" = "An existing capture is already in progress"; "IProov_PromptGetReady" = "Get ready…"; "IProov_PromptGrantPermission" = "Grant Camera Access"; diff --git a/SampleApp/SampleApp/es.lproj/Localizable.strings b/SampleApp/SampleApp/es.lproj/Localizable.strings index 5ecf79e..c52460c 100644 --- a/SampleApp/SampleApp/es.lproj/Localizable.strings +++ b/SampleApp/SampleApp/es.lproj/Localizable.strings @@ -11,7 +11,7 @@ "acuant_camera_move_closer" = "MUÉVETE MAS CERCA"; "acuant_camera_hold_steady" = "MANTENER ESTABLE"; "acuant_camera_capturing" = "CAPTURANDO"; -"acuant_camera_outside_view" = "ALINEAR"; +"acuant_camera_outside_view" = "MUY CERCA!"; "acuant_camera_paused" = "CÁMARA EN PAUSA"; "acuant_camera_capture_barcode" = "CAPTURAR CÓDIGO DE BARRAS"; @@ -37,7 +37,6 @@ /* AcuantIPLiveness */ "IProov_LanguageFile" = "es"; -"IProov_PromptConnecting" = "Conectando…"; "IProov_PromptTapToBegin" = "Toca la pantalla para comenzar"; "IProov_PromptTooFar" = "Muévete mas cerca"; "IProov_PromptTooBright" = "Ve a un lugar más sombrío"; @@ -73,14 +72,10 @@ "IProov_PromptPitchTooHigh" = "Sostenga el dispositivo a la altura de los ojos."; "IProov_PromptPitchTooLow" = "Sostenga el dispositivo a la altura de los ojos."; "IProov_ErrorNetwork" = "Network error"; -"IProov_ErrorEncoder" = "Encoder error"; -"IProov_ErrorCamera" = "Camera error"; "IProov_ErrorCameraPermissionDenied" = "Camera permission denied"; "IProov_ErrorCameraPermissionDeniedMessageIos" = "Please allow camera access for this app in iOS Settings"; "IProov_ErrorServer" = "Server error"; -"IProov_ErrorLightingModel" = "Lighting model error"; -"IProov_ErrorEncoderUnknownMessage" = "Unknown encoder error"; -"IProov_ErrorEncoderCodeMessage" = "Error code %@"; +"IProov_ErrorUnexpected" = "Unexpected error"; "IProov_ErrorCaptureAlreadyActive" = "An existing capture is already in progress"; "IProov_PromptGetReady" = "Prepararse…"; "IProov_PromptGrantPermission" = "Grant Camera Access"; diff --git a/SampleApp/SampleApp/fil.lproj/Localizable.strings b/SampleApp/SampleApp/fil.lproj/Localizable.strings index 6e79d88..9216e7a 100644 --- a/SampleApp/SampleApp/fil.lproj/Localizable.strings +++ b/SampleApp/SampleApp/fil.lproj/Localizable.strings @@ -37,7 +37,6 @@ /* AcuantIPLiveness */ "IProov_LanguageFile" = "fil"; -"IProov_PromptConnecting" = "Nagkokonekta…"; "IProov_PromptTapToBegin" = "I-tap ang screen para magsimula"; "IProov_PromptTooFar" = "Ilapit ang mukha sa screen"; "IProov_PromptTooBright" = "Masyadong maliwanag"; @@ -73,14 +72,10 @@ "IProov_PromptPitchTooHigh" = "Hawakan ang device pantay sa mata"; "IProov_PromptPitchTooLow" = "Hawakan ang device pantay sa mata"; "IProov_ErrorNetwork" = "Network error"; -"IProov_ErrorEncoder" = "Encoder error"; -"IProov_ErrorCamera" = "Camera error"; "IProov_ErrorCameraPermissionDenied" = "Camera permission denied"; "IProov_ErrorCameraPermissionDeniedMessageIos" = "Please allow camera access for this app in iOS Settings"; "IProov_ErrorServer" = "Server error"; -"IProov_ErrorLightingModel" = "Lighting model error"; -"IProov_ErrorEncoderUnknownMessage" = "Unknown encoder error"; -"IProov_ErrorEncoderCodeMessage" = "Error code %@"; +"IProov_ErrorUnexpected" = "Unexpected error"; "IProov_ErrorCaptureAlreadyActive" = "An existing capture is already in progress"; "IProov_PromptGetReady" = "Humanda…"; "IProov_PromptGrantPermission" = "Grant Camera Access"; diff --git a/iOSmigrationdetails.pdf b/iOSmigrationdetails.pdf deleted file mode 100644 index 7c0fe67..0000000 Binary files a/iOSmigrationdetails.pdf and /dev/null differ