InputStream/OutputStream implemented delegate and getBuffer

CoreFoundation/Stream.subproj/CFConcreteStreams.c

@@ -847,6 +847,56 @@ CFWriteStreamRef _CFWriteStreamCreateFromFileDescriptor(CFAllocatorRef alloc, in
 static const struct _CFStreamCallBacksV1 readDataCallBacks = {1, readDataCreate, readDataFinalize, readDataCopyDescription, readDataOpen, NULL, dataRead, dataGetBuffer, dataCanRead, NULL, NULL, NULL, NULL, NULL, NULL, readDataSchedule, NULL};
 static const struct _CFStreamCallBacksV1 writeDataCallBacks = {1, writeDataCreate, writeDataFinalize, writeDataCopyDescription, writeDataOpen, NULL, NULL, NULL, NULL, dataWrite, dataCanWrite, NULL, dataCopyProperty, NULL, NULL, writeDataSchedule, NULL};
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+
+Boolean _CFStreamInitWithFile(struct _CFStream *stream, CFURLRef fileURL, Boolean forReading) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    struct _CFStream *result = _CFStreamCreateWithFile(allocator, fileURL, forReading);
+    if (result == NULL) return false;
+    __CFCopyStream(stream, result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+
+CF_EXPORT Boolean _CFReadStreamInitWithBytesNoCopy(CFReadStreamRef stream, const UInt8 *bytes, CFIndex length, CFAllocatorRef bytesDeallocator) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    CFReadStreamRef result = CFReadStreamCreateWithBytesNoCopy(allocator, bytes, length, bytesDeallocator);
+    if (result == NULL) return false;
+    __CFCopyStream((struct _CFStream *)stream, (struct _CFStream *)result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+
+/* This needs to be exported to make it callable from Foundation. */
+CF_EXPORT Boolean _CFReadStreamInitWithData(CFReadStreamRef stream, CFDataRef data) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    CFReadStreamRef result = CFReadStreamCreateWithData(allocator, data);
+    if (result == NULL) return false;
+    __CFCopyStream((struct _CFStream *)stream, (struct _CFStream *)result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+
+Boolean _CFWriteStreamInitWithBuffer(CFWriteStreamRef stream, UInt8 *buffer, CFIndex bufferCapacity) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    CFWriteStreamRef result = CFWriteStreamCreateWithBuffer(allocator, buffer, bufferCapacity);
+    if (result == NULL) return false;
+    __CFCopyStream((struct _CFStream *)stream, (struct _CFStream *)result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+
+CF_EXPORT Boolean _CFWriteStreamInitWithAllocatedBuffers(CFWriteStreamRef stream, CFAllocatorRef bufferAllocator) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    CFWriteStreamRef result = CFWriteStreamCreateWithAllocatedBuffers(allocator, bufferAllocator);
+    if (result == NULL) return false;
+    __CFCopyStream((struct _CFStream *)stream, (struct _CFStream *)result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+
+#endif
+
 CF_EXPORT CFReadStreamRef CFReadStreamCreateWithBytesNoCopy(CFAllocatorRef alloc, const UInt8 *bytes, CFIndex length, CFAllocatorRef bytesDeallocator) {
     _CFReadDataStreamContext ctxt;
     CFReadStreamRef result;

CoreFoundation/Stream.subproj/CFStream.c

@@ -379,6 +379,32 @@ CF_EXPORT void* _CFStreamGetInfoPointer(struct _CFStream* stream) {
     return stream == NULL? NULL : stream->info;
 }
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+void __CFCopyStream(struct _CFStream *newStream, struct _CFStream *source) {
+    newStream->_cfBase._cfinfoa = source->_cfBase._cfinfoa;
+    newStream->flags = source->flags;
+    newStream->error = source->error;
+    newStream->client = source->client;
+    newStream->info = source->info;
+    newStream->callBacks = source->callBacks;
+    newStream->streamLock = source->streamLock;
+    newStream->previousRunloopsAndModes = source->previousRunloopsAndModes;
+#if __HAS_DISPATCH__
+    newStream->queue = source->queue;
+#endif
+    newStream->pendingEventsToDeliver = source->pendingEventsToDeliver;
+}
+
+Boolean _CFStreamInitWithConstantCallbacks(struct _CFStream *newStream, void *info,  const struct _CFStreamCallBacks *cb, Boolean isReading) {
+    CFAllocatorRef allocator = kCFAllocatorSystemDefault;
+    struct _CFStream *result = _CFStreamCreateWithConstantCallbacks(allocator, info, cb, isReading);
+    if (result == NULL) return false;
+    __CFCopyStream(newStream, result);
+    CFAllocatorDeallocate(allocator, result);
+    return true;
+}
+#endif
+
 CF_PRIVATE struct _CFStream *_CFStreamCreateWithConstantCallbacks(CFAllocatorRef alloc, void *info,  const struct _CFStreamCallBacks *cb, Boolean isReading) {
     struct _CFStream *newStream;
     if (cb->version != 1) return NULL;

CoreFoundation/Stream.subproj/CFStream.h

@@ -441,6 +441,11 @@ Boolean CFWriteStreamSetProperty(CFWriteStreamRef _Null_unspecified stream, CFSt
 
 */
 
+CF_EXPORT
+void *_CFReadStreamGetClient(CFReadStreamRef readStream);
+CF_EXPORT
+void *_CFWriteStreamGetClient(CFWriteStreamRef writeStream);
+
 CF_EXPORT
 Boolean CFReadStreamSetClient(CFReadStreamRef _Null_unspecified stream, CFOptionFlags streamEvents, CFReadStreamClientCallBack _Null_unspecified clientCB, CFStreamClientContext * _Null_unspecified clientContext);
 CF_EXPORT

CoreFoundation/Stream.subproj/CFStreamPriv.h

@@ -59,6 +59,8 @@ CF_EXPORT void* _CFStreamGetInfoPointer(struct _CFStream* stream);
 #define CF_PRIVATE extern __attribute__((__visibility__("hidden")))
 #endif
 
+void __CFCopyStream(struct _CFStream *newStream, struct _CFStream *source);
+
 // cb version must be > 0
 CF_PRIVATE struct _CFStream *_CFStreamCreateWithConstantCallbacks(CFAllocatorRef alloc, void *info, const struct _CFStreamCallBacks *cb, Boolean isReading);
 
@@ -74,6 +76,15 @@ CFReadStreamRef _CFReadStreamCreateFromFileDescriptor(CFAllocatorRef alloc, int
 CF_EXPORT
 CFWriteStreamRef _CFWriteStreamCreateFromFileDescriptor(CFAllocatorRef alloc, int fd);
 
+#if DEPLOYMENT_RUNTIME_SWIFT
+Boolean _CFStreamInitWithConstantCallbacks(struct _CFStream* newStream, void *info,  const struct _CFStreamCallBacks *cb, Boolean isReading);
+Boolean _CFStreamInitWithFile(struct _CFStream *stream, CFURLRef fileURL, Boolean forReading);
+
+CF_EXPORT Boolean _CFReadStreamInitWithBytesNoCopy(CFReadStreamRef stream, const UInt8 *bytes, CFIndex length, CFAllocatorRef bytesDeallocator);
+CF_EXPORT Boolean _CFReadStreamInitWithData(CFReadStreamRef stream, CFDataRef data);
+Boolean _CFWriteStreamInitWithBuffer(CFWriteStreamRef stream, UInt8 *buffer, CFIndex bufferCapacity);
+CF_EXPORT Boolean _CFWriteStreamInitWithAllocatedBuffers(CFWriteStreamRef stream, CFAllocatorRef bufferAllocator);
+#endif
 
 
 #define SECURITY_NONE   (0)

Docs/Status.md

@@ -184,9 +184,8 @@ There is no _Complete_ status for test coverage because there are always additio
     | `SocketPort`     | Unimplemented   | None          |                                                                               |
     | `PortMessage`    | Unimplemented   | None          |                                                                               |
     | `RunLoop`        | Mostly Complete | Incomplete    | `add(_: Port, forMode:)` and `remove(_: Port, forMode:)` remain unimplemented |
-    | `NSStream`       | Mostly Complete | Substantial   |                                                                               |
-    | `Stream`         | Unimplemented   | Substantial   | Methods which require a concrete implementation remain unimplemented          |
-    | `InputStream`    | Mostly Complete | Substantial   | `getBuffer(_:length:)` remains unimplemented                                  |
+    | `Stream`         | Complete        | Substantial   | `getStreamsToHost(withName:port:inputStream:outputStream:)` and `getBoundStreams(withBufferSize:inputStream:outputStream:)` class methods are disabled |
+    | `InputStream`    | Complete        | Substantial   |                                                                               |
     | `NSOutputStream` | Complete        | Substantial   |                                                                               |
     | `Timer`          | Complete        | Substantial   |                                                                               |
 

Foundation/NSSwiftRuntime.swift

@@ -173,11 +173,11 @@ internal func __CFInitializeSwift() {
     _CFRuntimeBridgeTypeToClass(CFCharacterSetGetTypeID(), unsafeBitCast(_NSCFCharacterSet.self, to: UnsafeRawPointer.self))
     _CFRuntimeBridgeTypeToClass(_CFKeyedArchiverUIDGetTypeID(), unsafeBitCast(_NSKeyedArchiverUID.self, to: UnsafeRawPointer.self))
 
-//    _CFRuntimeBridgeTypeToClass(CFErrorGetTypeID(), unsafeBitCast(NSError.self, UnsafeRawPointer.self))
+//    _CFRuntimeBridgeTypeToClass(CFErrorGetTypeID(), unsafeBitCast(NSError.self, to: UnsafeRawPointer.self))
     _CFRuntimeBridgeTypeToClass(CFAttributedStringGetTypeID(), unsafeBitCast(NSMutableAttributedString.self, to: UnsafeRawPointer.self))
-//    _CFRuntimeBridgeTypeToClass(CFReadStreamGetTypeID(), unsafeBitCast(InputStream.self, UnsafeRawPointer.self))
-//    _CFRuntimeBridgeTypeToClass(CFWriteStreamGetTypeID(), unsafeBitCast(OutputStream.self, UnsafeRawPointer.self))
-   _CFRuntimeBridgeTypeToClass(CFRunLoopTimerGetTypeID(), unsafeBitCast(Timer.self, to: UnsafeRawPointer.self))
+    _CFRuntimeBridgeTypeToClass(CFReadStreamGetTypeID(), unsafeBitCast(InputStream.self, to: UnsafeRawPointer.self))
+    _CFRuntimeBridgeTypeToClass(CFWriteStreamGetTypeID(), unsafeBitCast(OutputStream.self, to: UnsafeRawPointer.self))
+    _CFRuntimeBridgeTypeToClass(CFRunLoopTimerGetTypeID(), unsafeBitCast(Timer.self, to: UnsafeRawPointer.self))
 
     __CFSwiftBridge.NSObject.isEqual = _CFSwiftIsEqual
     __CFSwiftBridge.NSObject.hash = _CFSwiftGetHash

Foundation/PropertyListSerialization.swift

@@ -109,6 +109,6 @@ open class PropertyListSerialization : NSObject {
     }
 
     open class func propertyList(with stream: InputStream, options opt: ReadOptions = [], format: UnsafeMutablePointer<PropertyListFormat>?) throws -> Any {
-        return try propertyList(with: stream._stream, options: opt, format: format)
+        return try propertyList(with: stream._cfObject, options: opt, format: format)
     }
 }