LICENSE.txt

@@ -208,3 +208,18 @@
     portions of this Software are embedded into the binary product as a result,
     you may redistribute such product without providing attribution as would
     otherwise be required by Sections 4(a), 4(b) and 4(d) of the License.
+
+## Copyrights and Licenses for Third Party Software Distributed with swift-tools-support-async: ##
+
+The swift-tools-support-async software contains code written by third parties.
+Such software will have its own individual LICENSE file as part of its
+source or in the directory in which it appears.  This file will describe the
+copyrights, license, and restrictions which apply to that code.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+BLAKE3              ThirdParty/BLAKE3
+

Package.resolved

@@ -1,31 +1,58 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "swift-atomics",
+        "repositoryURL": "https://github.com/apple/swift-atomics.git",
+        "state": {
+          "branch": null,
+          "revision": "cd142fd2f64be2100422d658e7411e39489da985",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
+        "state": {
+          "branch": null,
+          "revision": "671108c96644956dddcd89dd59c203dcdb36cec7",
+          "version": "1.1.4"
+        }
+      },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "43931b7a7daf8120a487601530c8bc03ce711992",
-          "version": "2.25.1"
+          "revision": "f7dc3f527576c398709b017584392fb58592e7f5",
+          "version": "2.75.0"
         }
       },
       {
         "package": "SwiftProtobuf",
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "e1904bf5a5f79cb7e0ff68a427a53a93b652fcd1",
-          "version": "1.15.0"
+          "revision": "ebc7251dd5b37f627c93698e4374084d98409633",
+          "version": "1.28.2"
+        }
+      },
+      {
+        "package": "swift-system",
+        "repositoryURL": "https://github.com/apple/swift-system.git",
+        "state": {
+          "branch": null,
+          "revision": "c8a44d836fe7913603e246acab7c528c2e780168",
+          "version": "1.4.0"
         }
       },
       {
         "package": "swift-tools-support-core",
         "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
         "state": {
           "branch": null,
-          "revision": "2954e55faee5bfee928e844bb09e97fcfa8d24af",
-          "version": "0.2.0"
+          "revision": "ad2fc22a00b898c7af5d8c74a555666f67a06720",
+          "version": "0.7.0"
         }
       }
     ]

Package.swift

@@ -1,8 +1,26 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.5
 import PackageDescription
+import class Foundation.ProcessInfo
+
+let macOSPlatform: SupportedPlatform
+let iOSPlatform: SupportedPlatform
+if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTTSC_MACOS_DEPLOYMENT_TARGET"] {
+    macOSPlatform = .macOS(deploymentTarget)
+} else {
+    macOSPlatform = .macOS(.v10_15)
+}
+if let deploymentTarget = ProcessInfo.processInfo.environment["SWIFTTSC_IOS_DEPLOYMENT_TARGET"] {
+    iOSPlatform = .iOS(deploymentTarget)
+} else {
+    iOSPlatform = .iOS(.v13)
+}
 
 let package = Package(
     name: "swift-tools-support-async",
+    platforms: [
+        macOSPlatform,
+        iOSPlatform
+    ],
     products: [
         .library(
             name: "SwiftToolsSupportAsync",
@@ -12,9 +30,9 @@ let package = Package(
             targets: ["TSFCAS", "TSFCASFileTree", "TSFCASUtilities"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.8.0"),
-        .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.8.0"),
-        .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.1.8"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.68.0"),
+        .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.28.0"),
+        .package(url: "https://github.com/apple/swift-tools-support-core.git", "0.5.8" ..< "0.8.0"),
     ],
     targets: [
         // BLAKE3 hash support
@@ -29,7 +47,9 @@ let package = Package(
         .target(
             name: "TSFFutures",
             dependencies: [
-                "NIO", "SwiftToolsSupport-auto",
+                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core")
             ]
         ),
         .testTarget(
@@ -42,13 +62,17 @@ let package = Package(
             name: "TSFUtility",
             dependencies: [
                 "TSFFutures",
+                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOConcurrencyHelpers", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
             ]
         ),
 
         .target(
             name: "TSFCAS",
             dependencies: [
-                "TSFFutures", "TSFUtility", "CBLAKE3", "SwiftProtobuf",
+                "TSFFutures", "TSFUtility", "CBLAKE3",
+                .product(name: "SwiftProtobuf", package: "swift-protobuf")
             ]
         ),
         .target(

Protos/CASFileTreeProtocol/file_tree.proto

@@ -24,6 +24,20 @@ enum LLBFileType {
     SYMLINK = 0x3;
 }
 
+message LLBPosixFileDetails {
+    /// The POSIX permissions (&0o7777). Masking is useful when storing entries
+    /// with very restricted permissions (such as (perm & 0o0007) == 0).
+    uint32 mode = 1;
+
+    /// Owner user identifier.
+    /// Semantically, absent owner == 0x0 ~= current uid.
+    uint32 owner = 2;
+
+    /// Owner group identifier.
+    /// Semantically, absent owner == 0x0 ~= current gid.
+    uint32 group = 3;
+}
+
 message LLBDirectoryEntry {
     /// The name of the directory entry.
     string name = 1;
@@ -33,6 +47,10 @@ message LLBDirectoryEntry {
 
     /// The (aggregate) size of the directory entry.
     uint64 size = 3;
+
+    /// Mode and permissions. _Can_ optionally be present in the
+    /// directory entry because the file can be just a direct blob reference.
+    LLBPosixFileDetails posixDetails = 4;
 }
 
 /// The list of file names and associated information, of a directory.
@@ -56,6 +74,7 @@ message LLBFileInfo {
     /// is unspecified.
     uint64 size = 2;
 
+    /// OBSOLETE. Use posixDetails.
     /// The POSIX permissions (&0o777). Useful when storing entries
     /// with very restricted permissions (such as (perm & 0o007) == 0).
     uint32 posixPermissions = 3;
@@ -65,6 +84,9 @@ message LLBFileInfo {
     ///  * Compression is applied after chunking, to retain seekability.
     LLBFileDataCompressionMethod compression = 4;
 
+    /// Permission info useful for POSIX filesystems.
+    LLBPosixFileDetails posixDetails = 5;
+
     oneof payload {
         /// Files and symlinks:
         ///  * The file payload is contained in one or more

README.md

@@ -7,6 +7,6 @@ Common infrastructural helpers on top of NIO for [llbuild2](https://github.com/a
 Copyright (c) 2020 Apple Inc. and the Swift project authors.
 Licensed under Apache License v2.0 with Runtime Library Exception.
 
-See http://swift.org/LICENSE.txt for license information.
+See https://swift.org/LICENSE.txt for license information.
 
-See http://swift.org/CONTRIBUTORS.txt for Swift project authors.
+See https://swift.org/CONTRIBUTORS.txt for Swift project authors.

Sources/TSFCAS/DataID.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 
+import NIOCore
 import TSCBasic
 import TSFUtility
 
@@ -142,7 +143,7 @@ extension LLBDataID: LLBSerializable {
 
     @inlinable
     public init(from rawBytes: LLBByteBuffer) throws {
-        guard let bytes = rawBytes.getBytes(at: 0, length: rawBytes.readableBytes), let dataId = LLBDataID(bytes: bytes) else {
+        guard let dataId = LLBDataID(bytes: Array(buffer: rawBytes)) else {
             throw LLBDataIDSliceError.decoding("from slice of size \(rawBytes.readableBytes)")
         }
         self = dataId

Sources/TSFCAS/Database.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 
+import NIOCore
 import TSCUtility
 
 @_exported import TSFFutures
@@ -43,7 +44,7 @@ public struct LLBCASFeatures: Codable {
 /// A content-addressable database protocol
 ///
 /// THREAD-SAFETY: The database is expected to be thread-safe.
-public protocol LLBCASDatabase: AnyObject {
+public protocol LLBCASDatabase: AnyObject & Sendable {
     var group: LLBFuturesDispatchGroup { get }
 
     /// Get the supported features of this database implementation
@@ -151,10 +152,10 @@ public extension Context {
 
     var db: LLBCASDatabase {
         get {
-            guard let db = self[ObjectIdentifier(LLBCASDatabase.self)] else {
+            guard let db = self[ObjectIdentifier(LLBCASDatabase.self), as: LLBCASDatabase.self] else {
                 fatalError("no CAS database")
             }
-            return db as! LLBCASDatabase
+            return db
         }
         set {
             self[ObjectIdentifier(LLBCASDatabase.self)] = newValue

Sources/TSFCAS/DatabaseSpec.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 
+import NIOCore
 import TSFFutures
 
 

Sources/TSFCAS/Generated/CASProtocol/cas_object.pb.swift

@@ -37,13 +37,17 @@ public struct LLBPBCASObject {
 
   public var refs: [LLBDataID] = []
 
-  public var data: Data = SwiftProtobuf.Internal.emptyData
+  public var data: Data = Data()
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
 }
 
+#if swift(>=5.5) && canImport(_Concurrency)
+extension LLBPBCASObject: @unchecked Sendable {}
+#endif  // swift(>=5.5) && canImport(_Concurrency)
+
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 extension LLBPBCASObject: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
@@ -55,9 +59,12 @@ extension LLBPBCASObject: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
 
   public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try decoder.decodeRepeatedMessageField(value: &self.refs)
-      case 2: try decoder.decodeSingularBytesField(value: &self.data)
+      case 1: try { try decoder.decodeRepeatedMessageField(value: &self.refs) }()
+      case 2: try { try decoder.decodeSingularBytesField(value: &self.data) }()
       default: break
       }
     }

Sources/TSFCAS/Generated/CASProtocol/data_id.pb.swift

@@ -37,13 +37,17 @@ public struct LLBDataID {
   // methods supported on all messages.
 
   //// The bytes containing the digest of the contents store in the CAS.
-  public var bytes: Data = SwiftProtobuf.Internal.emptyData
+  public var bytes: Data = Data()
 
   public var unknownFields = SwiftProtobuf.UnknownStorage()
 
   public init() {}
 }
 
+#if swift(>=5.5) && canImport(_Concurrency)
+extension LLBDataID: @unchecked Sendable {}
+#endif  // swift(>=5.5) && canImport(_Concurrency)
+
 // MARK: - Code below here is support for the SwiftProtobuf runtime.
 
 extension LLBDataID: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
@@ -54,8 +58,11 @@ extension LLBDataID: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
 
   public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
     while let fieldNumber = try decoder.nextFieldNumber() {
+      // The use of inline closures is to circumvent an issue where the compiler
+      // allocates stack space for every case branch when no optimizations are
+      // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
-      case 1: try decoder.decodeSingularBytesField(value: &self.bytes)
+      case 1: try { try decoder.decodeSingularBytesField(value: &self.bytes) }()
       default: break
       }
     }

Sources/TSFCAS/Implementations/Blake3DataID.swift

@@ -8,6 +8,7 @@
 
 
 import CBLAKE3
+import NIOCore
 import TSFUtility
 
 

Sources/TSFCAS/Implementations/FileBackedCASDatabase.swift

@@ -88,10 +88,7 @@ public final class LLBFileBackedCASDatabase: LLBCASDatabase {
         let dataFile = fileName(for: id, prefix: .data)
 
         let refsBytes: LLBFuture<[UInt8]> = readFile(file: refsFile).map { refsData in
-            if let bytes = refsData.getBytes(at: 0, length: refsData.readableBytes) {
-                return bytes
-            }
-            return []
+            return Array(buffer: refsData)
         }
 
         let refs = refsBytes.flatMapThrowing {
@@ -135,7 +132,7 @@ public final class LLBFileBackedCASDatabase: LLBCASDatabase {
 
         let refsFile = fileName(for: id, prefix: .refs)
         let refData = try! JSONEncoder().encode(refs)
-        let refBytes = LLBByteBuffer.withBytes(ArraySlice<UInt8>(refData))
+        let refBytes = LLBByteBuffer.withBytes(refData)
         let refFuture = writeIfNeeded(data: refBytes, path: refsFile)
 
         return dataFuture.and(refFuture).map { _ in id }
@@ -188,7 +185,7 @@ public struct LLBFileBackedCASDatabaseScheme: LLBCASDatabaseScheme {
     }
 
     public static func open(group: LLBFuturesDispatchGroup, url: Foundation.URL) throws -> LLBCASDatabase {
-        return LLBFileBackedCASDatabase(group: group, path: AbsolutePath(url.path))
+        return try LLBFileBackedCASDatabase(group: group, path: AbsolutePath(validating: url.path))
     }
 }