Merge branch 'develop' into main

Author: helje5

.gitignore

@@ -70,4 +70,5 @@ fastlane/test_output
 .build-linux*
 Package.resolved
 dump*.json
+.swiftpm
 

.travis.yml

@@ -7,16 +7,18 @@ matrix:
  include:
  - os: Linux
  dist: trusty
- env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2.3-release/ubuntu1404/swift-4.2.3-RELEASE/swift-4.2.3-RELEASE-ubuntu14.04.tar.gz"
+ env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.0.2-release/ubuntu1404/swift-5.0.2-RELEASE/swift-5.0.2-RELEASE-ubuntu14.04.tar.gz"
  sudo: required
  - os: Linux
  dist: trusty
- env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz"
+ env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.1.3-release/ubuntu1404/swift-5.1.3-RELEASE/swift-5.1.3-RELEASE-ubuntu14.04.tar.gz"
+ sudo: required
+ - os: Linux
+ dist: xenial
+ env: SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.2-release/ubuntu1604/swift-5.2-RELEASE/swift-5.2-RELEASE-ubuntu16.04.tar.gz"
  sudo: required
  - os: osx
- osx_image: xcode10.1
- - os: osx
- osx_image: xcode10.2
+ osx_image: xcode11
 
 
 before_install:

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 
@@ -9,7 +9,7 @@ let package = Package(
  ],
  dependencies: [
  .package(url: "https://github.com/apple/swift-nio.git", 
- from: "1.13.2")
+ from: "2.18.0")
  ],
  targets: [
  .target(name: "NIOIRC", dependencies: [ "NIO" ])

Package@swift-5.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-irc open source project
 //
-// Copyright (c) 2018-2019 ZeeZide GmbH. and the swift-nio-irc project authors
+// Copyright (c) 2018-2020 ZeeZide GmbH. and the swift-nio-irc project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -247,40 +247,6 @@ open class IRCChannelHandler : ChannelDuplexHandler {
  buffer.writeInteger(cCR)
  buffer.writeInteger(cLF)
  }
- 
- #if swift(>=5) // NIO 2 API - default
- #else // NIO 1 API shims
- open func channelActive(ctx context: ChannelHandlerContext) {
- channelActive(context: context)
- }
- open func channelInactive(ctx context: ChannelHandlerContext) {
- channelInactive(context: context)
- }
- open func channelRead(ctx context: ChannelHandlerContext, data: NIOAny) {
- channelRead(context: context, data: data)
- }
- open func channelRead(ctx context: ChannelHandlerContext,
- value: InboundOut)
- {
- channelRead(context: context, value: value)
- }
- open func errorCaught(ctx context: ChannelHandlerContext,
- error: Swift.Error)
- {
- errorCaught(context: context, error: error)
- }
- public func write(ctx context: ChannelHandlerContext, data: NIOAny,
- promise: EventLoopPromise<Void>?)
- {
- write(context: context, data: data, promise: promise)
- }
- public final func write(ctx context: ChannelHandlerContext,
- value: IRCMessage,
- promise: EventLoopPromise<Void>?)
- {
- write(context: context, value: value, promise: promise)
- }
- #endif
 }
 
 extension ByteBuffer {
@@ -336,21 +302,3 @@ extension ByteBuffer {
  }
 
 }
-
-#if swift(>=5)
- // NIO 2
-#else
-fileprivate extension ByteBuffer {
- // NIO 2 API for NIO 1
- 
- @inline(__always) @discardableResult
- mutating func writeString(_ string: String) -> Int {
- return self.write(string: string) ?? -1337 // never fails
- }
-
- @inline(__always) @discardableResult
- mutating func writeInteger<T: FixedWidthInteger>(_ integer: T) -> Int {
- return self.write(integer: integer)
- }
-}
-#endif // swift(<5)

Sources/NIOIRC/IRCChannelHandler.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-irc open source project
 //
-// Copyright (c) 2018 ZeeZide GmbH. and the swift-nio-irc project authors
+// Copyright (c) 2018-2020 ZeeZide GmbH. and the swift-nio-irc project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -56,11 +56,7 @@ public struct IRCMessageParser {
  if var ob = overflowBuffer {
  overflowBuffer = nil
  var bb = buffer
- #if swift(>=5)
- ob.writeBuffer(&bb)
- #else
- ob.write(buffer: &bb)
- #endif
+ ob.writeBuffer(&bb)
  return feed(ob, yield: yield)
  }
 
@@ -71,11 +67,7 @@ public struct IRCMessageParser {
  var cursor = bp[bp.startIndex..<bp.endIndex]
 
  while !cursor.isEmpty {
- #if swift(>=5)
- guard var idx = cursor.firstIndex(of: cNewline) else { break }
- #else
- guard var idx = cursor.index(of: cNewline) else { break }
- #endif
+ guard var idx = cursor.firstIndex(of: cNewline) else { break }
 
  let nextCursor = cursor[idx.advanced(by: 1)..<cursor.endIndex]
  if idx > cursor.startIndex && cursor[idx - 1] == cCarriageReturn {
@@ -99,20 +91,12 @@ public struct IRCMessageParser {
 
  if !cursor.isEmpty {
  overflowBuffer = allocator.buffer(capacity: cursor.count)
- #if swift(>=5)
- overflowBuffer!.writeBytes(cursor)
- #else
- overflowBuffer!.write(bytes: cursor)
- #endif
+ overflowBuffer!.writeBytes(cursor)
  }
  }
  }
 
- #if swift(>=4.1)
- typealias Slice = Swift.Slice<UnsafeRawBufferPointer>
- #else
- typealias Slice = RandomAccessSlice<UnsafeRawBufferPointer>
- #endif
+ typealias Slice = Swift.Slice<UnsafeRawBufferPointer>
 
  @inline(__always)
  private func processLine(_ line: Slice) throws -> IRCMessage {
@@ -126,7 +110,7 @@ public struct IRCMessageParser {
 
  var cursor = line
 
- func isDigit(_ c: UInt8) -> Bool { return c >= 48 && c < 58 }
+ func isDigit(_ c: UInt8) -> Bool { return c >= c0 && c <= c9 }
  func isLetter(_ c: UInt8) -> Bool {
  return (c >= 0x41 && c <= 0x5A) || (c >= 0x61 && c <= 0x7A)
  }
@@ -155,12 +139,7 @@ public struct IRCMessageParser {
 
  if cursor[cursor.startIndex] == cColon {
  let startIndex = cursor.startIndex.advanced(by: 1)
-
- #if swift(>=5)
- let spaceIdx = line.firstIndex(of: cSpace)
- #else
- let spaceIdx = line.index(of: cSpace)
- #endif
+ let spaceIdx = line.firstIndex(of: cSpace)
 
  guard let endSourceIdx = spaceIdx, endSourceIdx > startIndex else {
  throw Error.invalidPrefix(Data(line))
@@ -203,12 +182,8 @@ public struct IRCMessageParser {
  cursor = cursor[idx2.advanced(by: 1)..<cursor.endIndex]
  }
  else {
- #if swift(>=5)
- let endIdx = cursor.firstIndex(where: { !isLetter($0) })
- ?? cursor.endIndex
- #else
- let endIdx = cursor.index(where: { !isLetter($0) }) ?? cursor.endIndex
- #endif
+ let endIdx = cursor.firstIndex(where: { !isLetter($0) })
+ ?? cursor.endIndex
 
  let cmdSlice = cursor[cursor.startIndex..<endIdx]
  guard let s = makeString(from: cmdSlice) else {
@@ -238,13 +213,9 @@ public struct IRCMessageParser {
  nextCursor = cursor[cursor.endIndex..<cursor.endIndex]
  }
  else if isNoSpaceControlLineFeedColon(cursor[cursor.startIndex]) {
- #if swift(>=5)
- let idxO = cursor.firstIndex(where: {
- !isNoSpaceControlLineFeedColon($0)
- })
- #else
- let idxO = cursor.index(where: { !isNoSpaceControlLineFeedColon($0) })
- #endif
+ let idxO = cursor.firstIndex(where: {
+ !isNoSpaceControlLineFeedColon($0)
+ })
  let idx = idxO ?? cursor.endIndex
  argSlice = cursor[cursor.startIndex..<idx]
  nextCursor = cursor[idx..<cursor.endIndex]
@@ -287,4 +258,3 @@ public struct IRCMessageParser {
  }
  }
 }
-

Sources/NIOIRC/IRCMessageParser.swift

@@ -193,8 +193,13 @@ extension IRCCommand : CustomStringConvertible {
 
  public var description : String {
  switch self {
- case .PING(let v), .PONG(let v):
- return "\(commandAsString) '\(v)'"
+ case .PING(let server, let server2), .PONG(let server, let server2):
+ if let server2 = server2 {
+ return "\(commandAsString) '\(server)' '\(server2)'"
+ }
+ else {
+ return "\(commandAsString) '\(server)'"
+ }
 
  case .QUIT(.some(let v)): return "QUIT '\(v)'"
  case .QUIT(.none): return "QUIT"

Sources/NIOIRC/Model/IRCCommand.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-irc open source project
 //
-// Copyright (c) 2018 ZeeZide GmbH. and the swift-nio-irc project authors
+// Copyright (c) 2018-2020 ZeeZide GmbH. and the swift-nio-irc project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -26,22 +26,12 @@ public struct IRCUserID : Hashable, CustomStringConvertible {
  }
 
  public init?(_ s: String) {
- #if swift(>=5)
- let atIdx = s.firstIndex(of: "@")
- #else
- let atIdx = s.index(of: "@")
- #endif
- if let atIdx = atIdx {
+ if let atIdx = s.firstIndex(of: "@") {
  let hs = s.index(after: atIdx)
  self.host = String(s[hs..<s.endIndex])
 
  let nickString : String
- #if swift(>=5)
- let exIdx = s.firstIndex(of: "!")
- #else
- let exIdx = s.index(of: "!")
- #endif
- if let exIdx = exIdx {
+ if let exIdx = s.firstIndex(of: "!") {
  let hs = s.index(after: exIdx)
  self.user = String(s[hs..<atIdx])
 

Sources/NIOIRC/Model/IRCUserID.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-irc open source project
 //
-// Copyright (c) 2018 ZeeZide GmbH. and the swift-nio-irc project authors
+// Copyright (c) 2018-2020 ZeeZide GmbH. and the swift-nio-irc project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -34,6 +34,9 @@ public struct IRCUserMode : OptionSet {
  public static let disableForwarding = IRCUserMode(rawValue: 1 << 10)
  public static let blockUnidentified = IRCUserMode(rawValue: 1 << 11)
  public static let connectedSecurely = IRCUserMode(rawValue: 1 << 12)
+ 
+ // UnrealIRCd https://www.unrealircd.org/docs/User_Modes "x"
+ public static let hideHostname = IRCUserMode(rawValue: 1 << 13)
 
  public var maskValue : UInt16 {
  return rawValue
@@ -43,17 +46,18 @@ public struct IRCUserMode : OptionSet {
  var mask : UInt16 = 0
  for c in string {
  switch c {
- case "w": mask += IRCUserMode.receivesWallOps.rawValue
- case "i": mask += IRCUserMode.invisible.rawValue
- case "a": mask += IRCUserMode.away.rawValue
- case "r": mask += IRCUserMode.restrictedConnection.rawValue
- case "o": mask += IRCUserMode.operator.rawValue
- case "O": mask += IRCUserMode.localOperator.rawValue
+ case "w": mask += IRCUserMode.receivesWallOps .rawValue
+ case "i": mask += IRCUserMode.invisible .rawValue
+ case "a": mask += IRCUserMode.away .rawValue
+ case "r": mask += IRCUserMode.restrictedConnection .rawValue
+ case "o": mask += IRCUserMode.operator .rawValue
+ case "O": mask += IRCUserMode.localOperator .rawValue
  case "s": mask += IRCUserMode.receivesServerNotices.rawValue
- case "g": mask += IRCUserMode.ignoreUnknown.rawValue
- case "Q": mask += IRCUserMode.disableForwarding.rawValue
- case "R": mask += IRCUserMode.blockUnidentified.rawValue
- case "Z": mask += IRCUserMode.connectedSecurely.rawValue
+ case "g": mask += IRCUserMode.ignoreUnknown .rawValue
+ case "Q": mask += IRCUserMode.disableForwarding .rawValue
+ case "R": mask += IRCUserMode.blockUnidentified .rawValue
+ case "Z": mask += IRCUserMode.connectedSecurely .rawValue
+ case "x": mask += IRCUserMode.hideHostname .rawValue
  default: return nil
  }
  }
@@ -63,6 +67,7 @@ public struct IRCUserMode : OptionSet {
 
  public var stringValue : String {
  var mode = ""
+ mode.reserveCapacity(8)
  if contains(.receivesWallOps) { mode += "w" }
  if contains(.invisible) { mode += "i" }
  if contains(.away) { mode += "a" }
@@ -74,6 +79,7 @@ public struct IRCUserMode : OptionSet {
  if contains(.disableForwarding) { mode += "Q" }
  if contains(.blockUnidentified) { mode += "R" }
  if contains(.connectedSecurely) { mode += "Z" }
+ if contains(.hideHostname) { mode += "x" }
  return mode
  }
 }