libQuic integration via libSession

.drone.jsonnet

@@ -1,38 +1,42 @@
 // This build configuration requires the following to be installed:
-// Git, Xcode, XCode Command-line Tools, Cocoapods, Xcbeautify, Xcresultparser, pip
+// Git, Xcode, XCode Command-line Tools, Cocoapods, xcbeautify, xcresultparser, pip
 
 // Log a bunch of version information to make it easier for debugging
 local version_info = {
   name: 'Version Information',
+  environment: { LANG: 'en_US.UTF-8' },
   commands: [
     'git --version',
-    'LANG=en_US.UTF-8 pod --version',
+    'pod --version',
     'xcodebuild -version',
-    'xcbeautify --version'
-  ]
+    'xcbeautify --version',
+    'xcresultparser --version',
+    'pip --version',
+  ],
 };
 
 // Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well)
 local clone_submodules = {
   name: 'Clone Submodules',
-  commands: [ 'git submodule update --init --recursive --depth=2 --jobs=4' ]
+  commands: ['git submodule update --init --recursive --depth=2 --jobs=4'],
 };
 
 // cmake options for static deps mirror
 local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
 
 // Cocoapods
-// 
+//
 // Unfortunately Cocoapods has a dumb restriction which requires you to use UTF-8 for the
 // 'LANG' env var so we need to work around the with https://github.com/CocoaPods/CocoaPods/issues/6333
 local install_cocoapods = {
   name: 'Install CocoaPods',
+  environment: { LANG: 'en_US.UTF-8' },
   commands: [
-    'LANG=en_US.UTF-8 pod install || (rm -rf ./Pods && LANG=en_US.UTF-8 pod install)'
+    'pod install || (rm -rf ./Pods && pod install)',
   ],
   depends_on: [
-    'Load CocoaPods Cache'
-  ]
+    'Load CocoaPods Cache',
+  ],
 };
 
 // Load from the cached CocoaPods directory (to speed up the build)
@@ -41,26 +45,26 @@ local load_cocoapods_cache = {
   commands: [
     |||
       LOOP_BREAK=0
-      while test -e /Users/drone/.cocoapods_cache.lock; do
+      while test -e /Users/$USER/.cocoapods_cache.lock; do
           sleep 1
           LOOP_BREAK=$((LOOP_BREAK + 1))
 
           if [[ $LOOP_BREAK -ge 600 ]]; then
-            rm -f /Users/drone/.cocoapods_cache.lock
+            rm -f /Users/$USER/.cocoapods_cache.lock
           fi
       done
     |||,
-    'touch /Users/drone/.cocoapods_cache.lock',
+    'touch /Users/$USER/.cocoapods_cache.lock',
     |||
-      if [[ -d /Users/drone/.cocoapods_cache ]]; then
-        cp -r /Users/drone/.cocoapods_cache ./Pods
+      if [[ -d /Users/$USER/.cocoapods_cache ]]; then
+        cp -r /Users/$USER/.cocoapods_cache ./Pods
       fi
     |||,
-    'rm -f /Users/drone/.cocoapods_cache.lock'
+    'rm -f /Users/$USER/.cocoapods_cache.lock',
   ],
   depends_on: [
-    'Clone Submodules'
-  ]
+    'Clone Submodules',
+  ],
 };
 
 // Override the cached CocoaPods directory (to speed up the next build)
@@ -69,69 +73,80 @@ local update_cocoapods_cache(depends_on) = {
   commands: [
     |||
       LOOP_BREAK=0
-      while test -e /Users/drone/.cocoapods_cache.lock; do
+      while test -e /Users/$USER/.cocoapods_cache.lock; do
           sleep 1
           LOOP_BREAK=$((LOOP_BREAK + 1))
 
           if [[ $LOOP_BREAK -ge 600 ]]; then
-            rm -f /Users/drone/.cocoapods_cache.lock
+            rm -f /Users/$USER/.cocoapods_cache.lock
           fi
       done
     |||,
-    'touch /Users/drone/.cocoapods_cache.lock',
+    'touch /Users/$USER/.cocoapods_cache.lock',
     |||
       if [[ -d ./Pods ]]; then
-        rsync -a --delete ./Pods/ /Users/drone/.cocoapods_cache
+        rsync -a --delete ./Pods/ /Users/$USER/.cocoapods_cache
       fi
     |||,
-    'rm -f /Users/drone/.cocoapods_cache.lock'
+    'rm -f /Users/$USER/.cocoapods_cache.lock',
   ],
   depends_on: depends_on,
 };
 
+local boot_simulator(device_type) = {
+  name: 'Boot Test Simulator',
+  commands: [
+    'devname="Test-iPhone-${DRONE_COMMIT:0:9}-${DRONE_BUILD_EVENT}"',
+    'xcrun simctl create "$devname" ' + device_type,
+    'sim_uuid=$(xcrun simctl list devices -je | jq -re \'[.devices[][] | select(.name == "\'$devname\'").udid][0]\')',
+    'xcrun simctl boot $sim_uuid',
+
+    'mkdir -p build/artifacts',
+    'echo $sim_uuid > ./build/artifacts/sim_uuid',
+    'echo $devname > ./build/artifacts/device_name',
+
+    'xcrun simctl list -je devices $sim_uuid | jq -r \'.devices[][0] | "\\u001b[32;1mSimulator " + .state + ": \\u001b[34m" + .name + " (\\u001b[35m" + .deviceTypeIdentifier + ", \\u001b[36m" + .udid + "\\u001b[34m)\\u001b[0m"\'',
+  ],
+};
+local sim_keepalive = {
+  name: '(Simulator keep-alive)',
+  commands: [
+    '/Users/$USER/sim-keepalive/keepalive.sh $(<./build/artifacts/sim_uuid)',
+  ],
+  depends_on: ['Boot Test Simulator'],
+};
+local sim_delete_cmd = 'if [ -f build/artifacts/sim_uuid ]; then rm -f /Users/$USER/sim-keepalive/$(<./build/artifacts/sim_uuid); fi';
+
 [
   // Unit tests (PRs only)
   {
     kind: 'pipeline',
     type: 'exec',
     name: 'Unit Tests',
     platform: { os: 'darwin', arch: 'arm64' },
-    trigger: { event: { exclude: [ 'push' ] } },
+    trigger: { event: { exclude: ['push'] } },
     steps: [
       version_info,
       clone_submodules,
       load_cocoapods_cache,
       install_cocoapods,
-      {
-        name: 'Clean Up Old Test Simulators',
-        commands: [
-          './Scripts/clean-up-old-test-simulators.sh'
-        ]
-      },
-      {
-        name: 'Pre-Boot Test Simulator',
-        commands: [
-          'mkdir -p build/artifacts',
-          'echo "Test-iPhone14-${DRONE_COMMIT:0:9}-${DRONE_BUILD_EVENT}" > ./build/artifacts/device_name',
-          'xcrun simctl create "$(<./build/artifacts/device_name)" com.apple.CoreSimulator.SimDeviceType.iPhone-14',
-          'echo $(xcrun simctl list devices | grep -m 1 $(<./build/artifacts/device_name) | grep -E -o -i "([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})") > ./build/artifacts/sim_uuid',
-          'xcrun simctl boot $(<./build/artifacts/sim_uuid)',
-          'echo "Pre-booting simulator complete: $(xcrun simctl list | sed "s/^[[:space:]]*//" | grep -o ".*$(<./build/artifacts/sim_uuid).*")"',
-        ]
-      },
+
+      boot_simulator('com.apple.CoreSimulator.SimDeviceType.iPhone-15'),
+      sim_keepalive,
       {
         name: 'Build and Run Tests',
         commands: [
           'NSUnbufferedIO=YES set -o pipefail && xcodebuild test -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -resultBundlePath ./build/artifacts/testResults.xcresult -parallelizeTargets -destination "platform=iOS Simulator,id=$(<./build/artifacts/sim_uuid)" -parallel-testing-enabled NO -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -collect-test-diagnostics never 2>&1 | xcbeautify --is-ci',
         ],
         depends_on: [
-          'Pre-Boot Test Simulator',
-          'Install CocoaPods'
+          'Boot Test Simulator',
+          'Install CocoaPods',
         ],
       },
       {
         name: 'Unit Test Summary',
         commands: [
+          sim_delete_cmd,
           |||
             if [[ -d ./build/artifacts/testResults.xcresult ]]; then
               xcresultparser --output-format cli --failed-tests-only ./build/artifacts/testResults.xcresult
@@ -142,8 +157,8 @@ local update_cocoapods_cache(depends_on) = {
         ],
         depends_on: ['Build and Run Tests'],
         when: {
-          status: ['failure', 'success']
-        }
+          status: ['failure', 'success'],
+        },
       },
       update_cocoapods_cache(['Build and Run Tests']),
       {
@@ -157,15 +172,15 @@ local update_cocoapods_cache(depends_on) = {
               which codecovcli > ./build/artifacts/codecov_path
             fi
           |||,
-          '$(<./build/artifacts/codecov_path) --version'
+          '$(<./build/artifacts/codecov_path) --version',
         ],
       },
       {
         name: 'Convert xcresult to xml',
         commands: [
           'xcresultparser --output-format cobertura ./build/artifacts/testResults.xcresult > ./build/artifacts/coverage.xml',
         ],
-        depends_on: ['Build and Run Tests']
+        depends_on: ['Build and Run Tests'],
       },
       {
         // No token needed for public repos
@@ -175,8 +190,8 @@ local update_cocoapods_cache(depends_on) = {
         ],
         depends_on: [
           'Convert xcresult to xml',
-          'Install Codecov CLI'
-        ]
+          'Install Codecov CLI',
+        ],
       },
     ],
   },
@@ -186,23 +201,23 @@ local update_cocoapods_cache(depends_on) = {
     type: 'exec',
     name: 'Check Build Artifact Existence',
     platform: { os: 'darwin', arch: 'arm64' },
-    trigger: { event: { exclude: [ 'push' ] } },
+    trigger: { event: { exclude: ['push'] } },
     steps: [
       {
         name: 'Poll for build artifact existence',
         commands: [
-          './Scripts/drone-upload-exists.sh'
-        ]
-      }
-    ]
+          './Scripts/drone-upload-exists.sh',
+        ],
+      },
+    ],
   },
   // Simulator build (non-PRs only)
   {
     kind: 'pipeline',
     type: 'exec',
     name: 'Simulator Build',
     platform: { os: 'darwin', arch: 'arm64' },
-    trigger: { event: { exclude: [ 'pull_request' ] } },
+    trigger: { event: { exclude: ['pull_request'] } },
     steps: [
       version_info,
       clone_submodules,
@@ -212,22 +227,22 @@ local update_cocoapods_cache(depends_on) = {
         name: 'Build',
         commands: [
           'mkdir build',
-          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | xcbeautify --is-ci'
+          'NSUnbufferedIO=YES set -o pipefail && xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | xcbeautify --is-ci',
         ],
         depends_on: [
-          'Install CocoaPods'
+          'Install CocoaPods',
         ],
       },
       update_cocoapods_cache(['Build']),
       {
         name: 'Upload artifacts',
         environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
         commands: [
-          './Scripts/drone-static-upload.sh'
+          './Scripts/drone-static-upload.sh',
         ],
         depends_on: [
-          'Build'
-        ]
+          'Build',
+        ],
       },
     ],
   },

.gitignore

@@ -30,3 +30,6 @@ Index/
 
 # CocoaPods
 Pods
+
+# VSCode
+.vscode

Podfile

@@ -8,15 +8,14 @@ install! 'cocoapods', :warn_for_unused_master_specs_repo => false
 # Dependencies to be included in the app and all extensions/frameworks
 abstract_target 'GlobalDependencies' do
   # FIXME: If https://github.com/jedisct1/swift-sodium/pull/249 gets resolved then revert this back to the standard pod
-  pod 'Sodium', :git => 'https://github.com/oxen-io/session-ios-swift-sodium.git', branch: 'session-build'
+  pod 'Sodium', :git => 'https://github.com/oxen-io/session-ios-swift-sodium.git', commit: '310c343'
   pod 'GRDB.swift/SQLCipher'
 
   # FIXME: Would be nice to migrate from CocoaPods to SwiftPackageManager (should allow us to speed up build time), haven't gone through all of the dependencies but currently unfortunately SQLCipher doesn't support SPM (for more info see: https://github.com/sqlcipher/sqlcipher/issues/371)
-  pod 'SQLCipher', '~> 4.5.3'
+  pod 'SQLCipher', '~> 4.5.7'
   pod 'WebRTC-lib'
 
   target 'Session' do
-    pod 'Reachability'
     pod 'PureLayout', '~> 3.1.8'
     pod 'NVActivityIndicatorView'
     pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage'
@@ -36,7 +35,6 @@ abstract_target 'GlobalDependencies' do
     pod 'SignalCoreKit', git: 'https://github.com/oxen-io/session-ios-core-kit', :commit => '3acbfe5'
 
     target 'SessionNotificationServiceExtension'
-    target 'SessionSnodeKit'
 
     # Dependencies that are shared across a number of extensions/frameworks but not all
     abstract_target 'ExtendedDependencies' do
@@ -49,15 +47,13 @@ abstract_target 'GlobalDependencies' do
 
       target 'SignalUtilitiesKit' do
         pod 'NVActivityIndicatorView'
-        pod 'Reachability'
         pod 'SAMKeychain'
         pod 'SwiftProtobuf', '~> 1.5.0'
         pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage'
         pod 'DifferenceKit'
       end
 
       target 'SessionMessagingKit' do
-        pod 'Reachability'
         pod 'SAMKeychain'
         pod 'SwiftProtobuf', '~> 1.5.0'
         pod 'DifferenceKit'
@@ -86,6 +82,21 @@ abstract_target 'GlobalDependencies' do
         end
       end
     end
+
+    target 'SessionSnodeKit' do
+      target 'SessionSnodeKitTests' do
+        inherit! :complete
+
+        pod 'Quick'
+        pod 'Nimble'
+
+        # Need to include these for the tests because otherwise it won't actually build
+        pod 'SAMKeychain'
+        pod 'PureLayout', '~> 3.1.8'
+        pod 'YYImage/libwebp', git: 'https://github.com/signalapp/YYImage'
+        pod 'DifferenceKit'
+      end
+    end
   end
 
   target 'SessionUIKit' do