Merge branch 'main' into fcappelli/subscription_oauth_api_v2

# Conflicts: # Sources/RemoteMessaging/Mappers/DefaultRemoteMessagingSurveyURLBuilder.swift
duckduckgo · Dec 2, 2024 · 38dd352 · 38dd352
2 parents 97e986e + 59f8fb2
commit 38dd352
Show file tree

Hide file tree

Showing 22 changed files with 1,731 additions and 8 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/BrowserServicesKit-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/BrowserServicesKit-Package.xcscheme
@@ -539,6 +539,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PrivacyStats"
+               BuildableName = "PrivacyStats"
+               BlueprintName = "PrivacyStats"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -824,6 +838,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PrivacyStatsTests"
+               BuildableName = "PrivacyStatsTests"
+               BlueprintName = "PrivacyStatsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/Package.resolved b/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "dfef00ef77f5181d1d8a4f7cc88f7b7c0514dd34",
-        "version" : "6.39.0"
+        "revision" : "c4bb146afdf0c7a93fb9a7d95b1cb255708a470d",
+        "version" : "6.41.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -46,14 +46,15 @@ let package = Package(
         .library(name: "Onboarding", targets: ["Onboarding"]),
         .library(name: "BrokenSitePrompt", targets: ["BrokenSitePrompt"]),
         .library(name: "PageRefreshMonitor", targets: ["PageRefreshMonitor"]),
+        .library(name: "PrivacyStats", targets: ["PrivacyStats"]),
     ],
     dependencies: [
         .package(url: "https://github.com/duckduckgo/duckduckgo-autofill.git", exact: "15.1.0"),
         .package(url: "https://github.com/duckduckgo/GRDB.swift.git", exact: "2.4.2"),
         .package(url: "https://github.com/duckduckgo/TrackerRadarKit", exact: "3.0.0"),
         .package(url: "https://github.com/duckduckgo/sync_crypto", exact: "0.3.0"),
         .package(url: "https://github.com/gumob/PunycodeSwift.git", exact: "3.0.0"),
-        .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "6.39.0"),
+        .package(url: "https://github.com/duckduckgo/content-scope-scripts", exact: "6.41.0"),
         .package(url: "https://github.com/duckduckgo/privacy-dashboard", exact: "7.2.1"),
         .package(url: "https://github.com/httpswift/swifter.git", exact: "1.5.0"),
         .package(url: "https://github.com/duckduckgo/bloom_cpp.git", exact: "3.0.0"),
@@ -453,6 +454,20 @@ let package = Package(
                 .define("DEBUG", .when(configuration: .debug))
             ]
         ),
+        .target(
+            name: "PrivacyStats",
+            dependencies: [
+                "Common",
+                "Persistence",
+                "TrackerRadarKit"
+            ],
+            resources: [
+                .process("PrivacyStats.xcdatamodeld")
+            ],
+            swiftSettings: [
+                .define("DEBUG", .when(configuration: .debug))
+            ]
+        ),
 
         // MARK: - Test Targets
         .testTarget(
@@ -689,6 +704,13 @@ let package = Package(
                 "PageRefreshMonitor"
             ]
         ),
+        .testTarget(
+            name: "PrivacyStatsTests",
+            dependencies: [
+                "PrivacyStats",
+                "TestUtils",
+            ]
+        ),
     ],
     cxxLanguageStandard: .cxx11
 )
diff --git a/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift b/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
@@ -166,6 +166,7 @@ public enum PrivacyProSubfeature: String, Equatable, PrivacySubfeature {
     case setAccessTokenCookieForSubscriptionDomains
     case isLaunchedROW
     case isLaunchedROWOverride
+    case freeTrials
 }
 
 public enum SslCertificatesSubfeature: String, PrivacySubfeature {

diff --git a/Sources/Common/Extensions/DateExtension.swift b/Sources/Common/Extensions/DateExtension.swift
@@ -64,7 +64,11 @@ public extension Date {
     }
 
     var startOfDay: Date {
-        return  Calendar.current.startOfDay(for: self)
+        return Calendar.current.startOfDay(for: self)
+    }
+
+    func daysAgo(_ days: Int) -> Date {
+        Calendar.current.date(byAdding: .day, value: -days, to: self)!
     }
 
     static var startOfMinuteNow: Date {

diff --git a/Sources/NetworkProtection/PacketTunnelProvider.swift b/Sources/NetworkProtection/PacketTunnelProvider.swift
@@ -43,7 +43,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
         case rekeyAttempt(_ step: RekeyAttemptStep)
         case failureRecoveryAttempt(_ step: FailureRecoveryStep)
         case serverMigrationAttempt(_ step: ServerMigrationAttemptStep)
-        case malformedErrorDetected(_ error: Error)
     }
 
     public enum AttemptStep: CustomDebugStringConvertible {
@@ -693,7 +692,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
             // Check that the error is valid and able to be re-thrown to the OS before shutting the tunnel down
             if let wrappedError = wrapped(error: error) {
                 // Wait for the provider to complete its pixel request.
-                providerEvents.fire(.malformedErrorDetected(error))
                 try? await Task.sleep(interval: .seconds(2))
                 throw wrappedError
             } else {
@@ -733,7 +731,6 @@ open class PacketTunnelProvider: NEPacketTunnelProvider {
             // Check that the error is valid and able to be re-thrown to the OS before shutting the tunnel down
             if let wrappedError = wrapped(error: error) {
                 // Wait for the provider to complete its pixel request.
-                providerEvents.fire(.malformedErrorDetected(error))
                 try? await Task.sleep(interval: .seconds(2))
                 throw wrappedError
             } else {

diff --git a/Sources/PrivacyStats/Logger+PrivacyStats.swift b/Sources/PrivacyStats/Logger+PrivacyStats.swift
@@ -0,0 +1,24 @@
+//
+//  Logger+PrivacyStats.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import os.log
+
+public extension Logger {
+    static var privacyStats = { Logger(subsystem: "Privacy Stats", category: "") }()
+}