From 923649f282e9db9b4a3a3207d2b2967d6365296e Mon Sep 17 00:00:00 2001 From: Kong XiangBo Date: Mon, 12 Feb 2018 02:31:20 +0800 Subject: [PATCH 1/4] use Xcode9.2 builded frameworks can build --- Kwazii/Kwazii.entitlements | 2 +- Kwazii/KwaziiAppDelegate.swift | 4 +- PacketTunnel/ENV.swift | 8 +-- .../Mac/PacketTunnel_Mac.entitlements | 2 +- PacketTunnel/PacketTunnelProvider.swift | 2 +- PacketTunnel/iOS/PacketTunnel.entitlements | 2 +- Shared/proxy/tun/StackHelper.m | 4 +- Surf-Mac/AdvancedWindowController.swift | 2 +- Surf-Mac/AppDelegate.swift | 10 ++-- Surf-Mac/Info.plist | 2 +- Surf-Mac/Surf-Mac.entitlements | 4 +- Surf-Today/Surf_Today.entitlements | 2 +- Surf.xcodeproj/project.pbxproj | 60 +++++++------------ Surf/AppDelegate.swift | 6 +- Surf/BuyViewController.swift | 4 +- Surf/ConfigTableViewController.swift | 2 +- Surf/DataShare.swift | 2 +- Surf/Info.plist | 4 +- Surf/LogFileViewController.swift | 2 +- Surf/LogListTableViewController.swift | 4 +- Surf/ProxyGroupViewController.swift | 8 +-- Surf/SFConfigViewController.swift | 2 +- Surf/SFRuleHelper.swift | 2 +- Surf/SFTableViewController.swift | 2 +- Surf/SFVPNManager.swift | 14 ++--- Surf/SFVerify.swift | 4 +- Surf/Surf.entitlements | 8 +-- Surf/const.swift | 22 +++---- SurfToday/TodayViewController.swift | 6 +- SurfToday/today.entitlements | 2 +- 30 files changed, 92 insertions(+), 106 deletions(-) diff --git a/Kwazii/Kwazii.entitlements b/Kwazii/Kwazii.entitlements index 19ba818..1c4fac4 100644 --- a/Kwazii/Kwazii.entitlements +++ b/Kwazii/Kwazii.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - 745WQDK4L7.com.abigt.Surf + 745WQDK4L7.com.yarshure.Surf diff --git a/Kwazii/KwaziiAppDelegate.swift b/Kwazii/KwaziiAppDelegate.swift index c412fa0..79451a0 100644 --- a/Kwazii/KwaziiAppDelegate.swift +++ b/Kwazii/KwaziiAppDelegate.swift @@ -7,7 +7,7 @@ // import Cocoa -let appgroup = "745WQDK4L7.com.abigt.Surf" +let appgroup = "745WQDK4L7.com.yarshure.Surf" import XRuler import Xcon import Sparkle @@ -173,7 +173,7 @@ class KwaziiAppDelegate: NSObject, NSApplicationDelegate,NSMenuDelegate { return unsigned } - let dnsqueue:DispatchQueue = DispatchQueue(label:"com.abigt.dns") + let dnsqueue:DispatchQueue = DispatchQueue(label:"com.yarshure.dns") @IBAction func openRule(_ sender:Any){ let url = fm.containerURL(forSecurityApplicationGroupIdentifier: groupIdentifier)!.appendingPathComponent("abigt.conf") diff --git a/PacketTunnel/ENV.swift b/PacketTunnel/ENV.swift index f6d6dde..d824cb0 100644 --- a/PacketTunnel/ENV.swift +++ b/PacketTunnel/ENV.swift @@ -26,13 +26,13 @@ func prepare() { AxLogger.logleve = .Debug #if os(iOS) - if !SKit.prepare("group.com.abigt.Surf", app: "xxxx", config: "surf.con"){ + if !SKit.prepare("group.com.yarshure.Surf", app: "xxxx", config: "surf.con"){ fatalError("framework init error!") } NSLog("init ################333") #elseif os(macOS) - if !SKit.prepare("745WQDK4L7.com.abigt.Surf", app: "xxxx", config: "abigt.conf"){ + if !SKit.prepare("745WQDK4L7.com.yarshure.Surf", app: "xxxx", config: "abigt.conf"){ fatalError("framework init error!") } #endif @@ -50,6 +50,6 @@ func prepareApp() { XProxy.debugEanble = true XRuler.kProxyGroupFile = ".ProxyGroup" - XRuler.groupIdentifier = "group.com.abigt.Surf" - SKit.groupIdentifier = "group.com.abigt.Surf" + XRuler.groupIdentifier = "group.com.yarshure.Surf" + SKit.groupIdentifier = "group.com.yarshure.Surf" } diff --git a/PacketTunnel/Mac/PacketTunnel_Mac.entitlements b/PacketTunnel/Mac/PacketTunnel_Mac.entitlements index 0ab7b90..4411cf6 100644 --- a/PacketTunnel/Mac/PacketTunnel_Mac.entitlements +++ b/PacketTunnel/Mac/PacketTunnel_Mac.entitlements @@ -3,7 +3,7 @@ com.apple.application-identifier - 745WQDK4L7.com.abigt.Surf.mac.extension + 745WQDK4L7.com.yarshure.Surf.mac.extension com.apple.developer.networking.networkextension app-proxy-provider diff --git a/PacketTunnel/PacketTunnelProvider.swift b/PacketTunnel/PacketTunnelProvider.swift index ecbea0e..0e35f7d 100644 --- a/PacketTunnel/PacketTunnelProvider.swift +++ b/PacketTunnel/PacketTunnelProvider.swift @@ -8,7 +8,7 @@ // import NetworkExtension -import SwiftyJSON + import SFSocket import AxLogger import Crashlytics diff --git a/PacketTunnel/iOS/PacketTunnel.entitlements b/PacketTunnel/iOS/PacketTunnel.entitlements index 96286b5..a74d442 100644 --- a/PacketTunnel/iOS/PacketTunnel.entitlements +++ b/PacketTunnel/iOS/PacketTunnel.entitlements @@ -14,7 +14,7 @@ com.apple.security.application-groups - group.com.abigt.Surf + group.com.yarshure.Surf diff --git a/Shared/proxy/tun/StackHelper.m b/Shared/proxy/tun/StackHelper.m index 79b3fe4..142a568 100644 --- a/Shared/proxy/tun/StackHelper.m +++ b/Shared/proxy/tun/StackHelper.m @@ -46,14 +46,14 @@ void crashSignalHandler(int signal) { - //let c = FileManager.default.containerURLForSecurityApplicationGroupIdentifier("group.com.abigt.Surf") + //let c = FileManager.default.containerURLForSecurityApplicationGroupIdentifier("group.com.yarshure.Surf") //urlContain = c!.appendingPathComponent("Log") //SFVPNSession *s = [sf session]; //NSString *name = @"abc";// s.idenString; NSString *d = @""; NSString *fileName = [NSString stringWithFormat:@"Log/%@/crash.log",d]; - NSURL *c = [[[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.com.abigt.Surf"] URLByAppendingPathComponent:fileName]; + NSURL *c = [[[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.com.yarshure.Surf"] URLByAppendingPathComponent:fileName]; const char* fileNameCString = [[c path] cStringUsingEncoding:NSUTF8StringEncoding]; FILE* crashFile = fopen(fileNameCString, "w"); diff --git a/Surf-Mac/AdvancedWindowController.swift b/Surf-Mac/AdvancedWindowController.swift index 49c572c..39cbbd3 100644 --- a/Surf-Mac/AdvancedWindowController.swift +++ b/Surf-Mac/AdvancedWindowController.swift @@ -56,7 +56,7 @@ class AdvancedWindowController: NSWindowController { ProxyGroupSettings.share.showCountry = false } - let x = UserDefaults.standard.object(forKey: "com.abigt.surf.UbiquityIdentityToken") + let x = UserDefaults.standard.object(forKey: "com.yarshure.surf.UbiquityIdentityToken") if x == nil { iCloudButton.state = NSControl.StateValue(rawValue: 0) alertMesage("Invalid iCloud token") diff --git a/Surf-Mac/AppDelegate.swift b/Surf-Mac/AppDelegate.swift index aa2298d..6c2e045 100644 --- a/Surf-Mac/AppDelegate.swift +++ b/Surf-Mac/AppDelegate.swift @@ -39,7 +39,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate,NSMenuDelegate ,NSTouchBar let url = fm.containerURL(forSecurityApplicationGroupIdentifier: groupIdentifier)! return url.appendingPathComponent("Log") }() - let dnsqueue:DispatchQueue = DispatchQueue(label:"com.abigt.dns") + let dnsqueue:DispatchQueue = DispatchQueue(label:"com.yarshure.dns") @IBOutlet weak var statusView: StatusView! var targetManager : NEVPNManager? var managers = [NEVPNManager]() @@ -618,7 +618,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate,NSMenuDelegate ,NSTouchBar func applicationDidFinishLaunching(_ notification: Notification) { Fabric.with([Crashlytics.self]) - XRuler.groupIdentifier = "745WQDK4L7.com.abigt.Surf" + XRuler.groupIdentifier = "745WQDK4L7.com.yarshure.Surf" UserDefaults.standard.set(true, forKey: "NSApplicationCrashOnExceptions") copyConfig() // testTouchBar() @@ -645,7 +645,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate,NSMenuDelegate ,NSTouchBar func showScan(){ let queue = DispatchQueue.init(label: ".", qos: .background, attributes: .concurrent, autoreleaseFrequency: .inherit, target: nil) - //let queue = DispatchQueue(label: "com.abigt.socket")// DISPATCH_QUEUE_CONCURRENT) + //let queue = DispatchQueue(label: "com.yarshure.socket")// DISPATCH_QUEUE_CONCURRENT) for p in ProxyGroupSettings.share.proxys { queue.async(execute: { @@ -942,13 +942,13 @@ extension AppDelegate { if let currentiCloudToken = fm.ubiquityIdentityToken{ let newTokenData:NSData = NSKeyedArchiver.archivedData(withRootObject: currentiCloudToken) as NSData print("token \(newTokenData)") - UserDefaults.standard.set(newTokenData, forKey: "com.abigt.surf.UbiquityIdentityToken") + UserDefaults.standard.set(newTokenData, forKey: "com.yarshure.surf.UbiquityIdentityToken") let iCloudToken = NSKeyedArchiver.archivedData(withRootObject: currentiCloudToken) //setObject: newTokenData //forKey: @"com.apple.MyAppName.UbiquityIdentityToken"]; }else { UserDefaults.standard - .removeObject(forKey: "com.abigt.surf.UbiquityIdentityToken") + .removeObject(forKey: "com.yarshure.surf.UbiquityIdentityToken") } NotificationCenter.default.addObserver(forName: NSNotification.Name.NSUbiquityIdentityDidChange, object: nil, queue: OperationQueue.main) { (noti:Notification) in print("NSUbiquityIdentityDidChangeNotification") diff --git a/Surf-Mac/Info.plist b/Surf-Mac/Info.plist index 1a50914..07e0a0c 100644 --- a/Surf-Mac/Info.plist +++ b/Surf-Mac/Info.plist @@ -54,7 +54,7 @@ SFApplication NSUbiquitousContainers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf NSUbiquitousContainerIsDocumentScopePublic diff --git a/Surf-Mac/Surf-Mac.entitlements b/Surf-Mac/Surf-Mac.entitlements index 3ede36d..d2d4dbb 100644 --- a/Surf-Mac/Surf-Mac.entitlements +++ b/Surf-Mac/Surf-Mac.entitlements @@ -3,10 +3,10 @@ com.apple.application-identifier - 745WQDK4L7.com.abigt.Surf.mac + 745WQDK4L7.com.yarshure.Surf.mac com.apple.developer.icloud-container-identifiers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf com.apple.developer.icloud-services diff --git a/Surf-Today/Surf_Today.entitlements b/Surf-Today/Surf_Today.entitlements index 27e4f32..fdabb0a 100644 --- a/Surf-Today/Surf_Today.entitlements +++ b/Surf-Today/Surf_Today.entitlements @@ -7,7 +7,7 @@ com.apple.security.files.user-selected.read-only com.apple.application-identifier - 745WQDK4L7.com.abigt.Surf.mac.Surf-Today + 745WQDK4L7.com.yarshure.Surf.mac.Surf-Today com.apple.developer.networking.networkextension packet-tunnel-provider diff --git a/Surf.xcodeproj/project.pbxproj b/Surf.xcodeproj/project.pbxproj index 13ea02a..27c7d1d 100644 --- a/Surf.xcodeproj/project.pbxproj +++ b/Surf.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ 693AAE77200EEA3C009E481E /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693AAE76200EEA3C009E481E /* MainWindow.swift */; }; 693AAE79200EED15009E481E /* RequestBasic.xib in Resources */ = {isa = PBXBuildFile; fileRef = 693AAE78200EED15009E481E /* RequestBasic.xib */; }; 693AAE7A200EF24F009E481E /* RequestBasic.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 693AAE38200EE3D3009E481E /* RequestBasic.storyboard */; }; - 693AAE7C200EF7F3009E481E /* abigt.conf in Resources */ = {isa = PBXBuildFile; fileRef = 693AAE7B200EF7F3009E481E /* abigt.conf */; }; + 693AAE7C200EF7F3009E481E /* yarshure.conf in Resources */ = {isa = PBXBuildFile; fileRef = 693AAE7B200EF7F3009E481E /* yarshure.conf */; }; 693AAE7D200F0F7A009E481E /* PreferencesWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6906B9161DE2A6E300A60B66 /* PreferencesWindowController.swift */; }; 693AAE7F200F0F81009E481E /* PreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6906B9181DE2A6EC00A60B66 /* PreferencesWindowController.xib */; }; 693AAE82200F1742009E481E /* SFCountry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693DBDFE1C96977A0067595C /* SFCountry.swift */; }; @@ -622,7 +622,7 @@ 693AAE75200EE9A0009E481E /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = NetworkExtension.framework; sourceTree = ""; }; 693AAE76200EEA3C009E481E /* MainWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindow.swift; sourceTree = ""; }; 693AAE78200EED15009E481E /* RequestBasic.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RequestBasic.xib; sourceTree = ""; }; - 693AAE7B200EF7F3009E481E /* abigt.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = abigt.conf; sourceTree = ""; }; + 693AAE7B200EF7F3009E481E /* yarshure.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = yarshure.conf; sourceTree = ""; }; 693B603C1C479F2A00173D0B /* thanks.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = thanks.txt; sourceTree = ""; }; 693B603E1C48867500173D0B /* const.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = const.swift; sourceTree = ""; }; 693B74491ED9FA69004C6E87 /* SFSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFSocket.framework; path = Carthage/Build/iOS/SFSocket.framework; sourceTree = ""; }; @@ -674,8 +674,6 @@ 69673C501F32D6A30003AB6C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/help.strings"; sourceTree = ""; }; 696847771D504E87005E17C2 /* SFAppExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFAppExtension.swift; sourceTree = ""; }; 696DD2D91C7B132E00C34416 /* OndemandController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OndemandController.swift; sourceTree = ""; }; - 696E33991C99479C0075B635 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = share/lib/libcrypto.a; sourceTree = ""; }; - 696E339A1C99479C0075B635 /* libsodium.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsodium.a; path = share/lib/libsodium.a; sourceTree = ""; }; 696E73AB1C44982400DF9A39 /* PacketTunnel-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "PacketTunnel-iOS.xcconfig"; path = "iOS/PacketTunnel-iOS.xcconfig"; sourceTree = ""; }; 696E73B31C44CEEA00DF9A39 /* DataShare.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataShare.swift; sourceTree = ""; }; 696E73B41C44CEEA00DF9A39 /* Socks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Socks.swift; sourceTree = ""; }; @@ -742,7 +740,6 @@ 69A0900A1C4C851C0064D361 /* SFWebViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFWebViewController.swift; sourceTree = ""; }; 69A0900C1C4C8CCC0064D361 /* config.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = config.html; sourceTree = ""; }; 69A4ACE31D2E37C7008963FB /* WidgetSelectViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidgetSelectViewController.swift; sourceTree = ""; }; - 69A742DA1CA15CA90000ABA1 /* libmbedcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmbedcrypto.a; path = share/lib/libmbedcrypto.a; sourceTree = ""; }; 69A99E4B1C6A2E96009EC4C5 /* SFLog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFLog.swift; sourceTree = ""; }; 69A9FE4B1CC5C0CF00D5DB41 /* ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = ionicons.ttf; sourceTree = ""; }; 69AD9CC7200354A100C01011 /* XFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XFoundation.framework; path = Carthage/Build/iOS/XFoundation.framework; sourceTree = ""; }; @@ -1000,16 +997,6 @@ name = inapp; sourceTree = ""; }; - 691B36631C0F4ADC001C815D /* openssl */ = { - isa = PBXGroup; - children = ( - 69A742DA1CA15CA90000ABA1 /* libmbedcrypto.a */, - 696E33991C99479C0075B635 /* libcrypto.a */, - 696E339A1C99479C0075B635 /* libsodium.a */, - ); - name = openssl; - sourceTree = ""; - }; 692D8CF81C6A250400C07B3A /* Frameworks */ = { isa = PBXGroup; children = ( @@ -1044,7 +1031,6 @@ children = ( 691B366C1C0F4BAE001C815D /* libresolv.tbd */, 6989AB031C312A3400DD1435 /* Shared */, - 691B36631C0F4ADC001C815D /* openssl */, 69366E581BFECBE700AE123D /* Surf */, 578ED92A1C03181300913B2F /* PacketTunnel */, 69C4EE2A1C2919010020FBF8 /* Surf-Mac */, @@ -1115,7 +1101,7 @@ 693AAE0F200EDA4E009E481E /* Kwazii */ = { isa = PBXGroup; children = ( - 693AAE7B200EF7F3009E481E /* abigt.conf */, + 693AAE7B200EF7F3009E481E /* yarshure.conf */, 693AAE10200EDA4E009E481E /* KwaziiAppDelegate.swift */, 6907E9CA201178A900E7B1FE /* Sparkle.framework */, 693AAE76200EEA3C009E481E /* MainWindow.swift */, @@ -1859,7 +1845,7 @@ 693AAE7A200EF24F009E481E /* RequestBasic.storyboard in Resources */, 693AAE83200F1A94009E481E /* data.json in Resources */, 6907E9C120102B1900E7B1FE /* HelpWindow.xib in Resources */, - 693AAE7C200EF7F3009E481E /* abigt.conf in Resources */, + 693AAE7C200EF7F3009E481E /* yarshure.conf in Resources */, 693AAE7F200F0F81009E481E /* PreferencesWindowController.xib in Resources */, 6907E9D42011959E00E7B1FE /* Assets.xcassets in Resources */, 693AAE18200EDA4F009E481E /* Main.storyboard in Resources */, @@ -1942,7 +1928,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./iosLib/Fabric.framework/run key token\n"; + shellScript = "./iosLib/Fabric.framework/run c9fadabbd94966964cc83af7873deadbe56ceb89 e746b1825d577768a63f93d7b2ddd5177ab095a1a9152a29666458e8e5d514f1\n"; }; 696AF49B1F02475A00756E5E /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1955,7 +1941,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./iosLib/Fabric.framework/run key token"; + shellScript = "./iosLib/Fabric.framework/run c9fadabbd94966964cc83af7873deadbe56ceb89 e746b1825d577768a63f93d7b2ddd5177ab095a1a9152a29666458e8e5d514f1\n"; }; 69B37CC21F035F03007E64CE /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -1981,7 +1967,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./iosLib/Fabric.framework/run key token"; + shellScript = "./iosLib/Fabric.framework/run c9fadabbd94966964cc83af7873deadbe56ceb89 e746b1825d577768a63f93d7b2ddd5177ab095a1a9152a29666458e8e5d514f1\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -2332,7 +2318,7 @@ "-lstdc++", "-lz", ); - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4.PacketTunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4.PacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "eef210fb-7ea4-4a7d-8f18-4ff2f1e1da2b"; PROVISIONING_PROFILE_SPECIFIER = packet4; @@ -2378,7 +2364,7 @@ "-lstdc++", "-lz", ); - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4.PacketTunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4.PacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "7fd37df6-507e-430d-b3cb-3fefc31a34c9"; PROVISIONING_PROFILE_SPECIFIER = p4_store; @@ -2412,7 +2398,7 @@ INFOPLIST_FILE = SurfToday/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4.SurfToday; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4.SurfToday; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "59e3bf3a-c4e8-4483-9520-d27b72ce9e7d"; PROVISIONING_PROFILE_SPECIFIER = today4; @@ -2444,7 +2430,7 @@ INFOPLIST_FILE = SurfToday/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4.SurfToday; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4.SurfToday; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "139784b1-3780-497b-9e2d-1a0143bd5c52"; PROVISIONING_PROFILE_SPECIFIER = t4_store; @@ -2590,7 +2576,7 @@ INFOPLIST_FILE = Surf/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "2f50898e-83b3-4593-b48b-dc016d890a1b"; PROVISIONING_PROFILE_SPECIFIER = surf4; @@ -2632,7 +2618,7 @@ INFOPLIST_FILE = Surf/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf4; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf4; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "7b2bfca4-e903-4dd9-bad7-212ff6bcc70b"; PROVISIONING_PROFILE_SPECIFIER = sf4_store; @@ -2669,7 +2655,7 @@ INFOPLIST_FILE = Kwazii/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Kwazii; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Kwazii; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; @@ -2702,7 +2688,7 @@ INFOPLIST_FILE = Kwazii/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Kwazii; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Kwazii; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; @@ -2736,7 +2722,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.XDataService; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.XDataService; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -2774,7 +2760,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.XDataService; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.XDataService; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -2804,7 +2790,7 @@ INFOPLIST_FILE = "Surf-Today/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = "com.abigt.Surf.mac.Surf-Today"; + PRODUCT_BUNDLE_IDENTIFIER = "com.yarshure.Surf.mac.Surf-Today"; PRODUCT_NAME = "A.BIG.T-Today"; PROVISIONING_PROFILE = "1aff835d-b9fc-4f39-bce3-56c2b6449295"; PROVISIONING_PROFILE_SPECIFIER = SurfToday; @@ -2836,7 +2822,7 @@ INFOPLIST_FILE = "Surf-Today/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = "com.abigt.Surf.mac.Surf-Today"; + PRODUCT_BUNDLE_IDENTIFIER = "com.yarshure.Surf.mac.Surf-Today"; PRODUCT_NAME = "A.BIG.T-Today"; PROVISIONING_PROFILE = "4c19f325-3933-49d2-b2a1-32cefdb3d37c"; PROVISIONING_PROFILE_SPECIFIER = SurfTodayXX; @@ -2869,7 +2855,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.13; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf.mac; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf.mac; PRODUCT_NAME = A.BIG.T; PROVISIONING_PROFILE = "6fd5297f-b0c7-44a5-89df-078d148c8357"; PROVISIONING_PROFILE_SPECIFIER = mac6; @@ -2902,7 +2888,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.13; - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf.mac; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf.mac; PRODUCT_NAME = A.BIG.T; PROVISIONING_PROFILE = "388485b7-2692-4daf-8690-700c62c9bee9"; PROVISIONING_PROFILE_SPECIFIER = mac6_store; @@ -2947,7 +2933,7 @@ "-lssl", "-lcrypto", ); - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf.mac.extension; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf.mac.extension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "a231acd3-d2b2-4247-9c38-2f260bd665aa"; PROVISIONING_PROFILE_SPECIFIER = mac6ext; @@ -2993,7 +2979,7 @@ "-lssl", "-lcrypto", ); - PRODUCT_BUNDLE_IDENTIFIER = com.abigt.Surf.mac.extension; + PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf.mac.extension; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "c0f3aac9-899c-44ce-aba2-b27bf823f36d"; PROVISIONING_PROFILE_SPECIFIER = 222; diff --git a/Surf/AppDelegate.swift b/Surf/AppDelegate.swift index 0dee1f0..04a6a3d 100644 --- a/Surf/AppDelegate.swift +++ b/Surf/AppDelegate.swift @@ -185,13 +185,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate { if let currentiCloudToken = fm.ubiquityIdentityToken{ let newTokenData:NSData = NSKeyedArchiver.archivedData(withRootObject: currentiCloudToken) as NSData print("token \(newTokenData)") - UserDefaults.standard.set(newTokenData, forKey: "com.abigt.surf.UbiquityIdentityToken") + UserDefaults.standard.set(newTokenData, forKey: "com.yarshure.surf.UbiquityIdentityToken") iCloudToken = NSKeyedArchiver.archivedData(withRootObject: currentiCloudToken) //setObject: newTokenData //forKey: @"com.apple.MyAppName.UbiquityIdentityToken"]; }else { UserDefaults.standard - .removeObject(forKey: "com.abigt.surf.UbiquityIdentityToken") + .removeObject(forKey: "com.yarshure.surf.UbiquityIdentityToken") } NotificationCenter.default.addObserver(forName: NSNotification.Name.NSUbiquityIdentityDidChange, object: nil, queue: OperationQueue.main) { (noti:Notification) in print("NSUbiquityIdentityDidChangeNotification") @@ -428,7 +428,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { SKit.xxIpAddr = "240.7.1.12" SKit.tunIP = "240.7.1.9" Xcon.debugEnable = true - XRuler.groupIdentifier = "group.com.abigt.Surf" + XRuler.groupIdentifier = "group.com.yarshure.Surf" var url = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: XRuler.groupIdentifier)! url.appendPathComponent("abigt.conf") diff --git a/Surf/BuyViewController.swift b/Surf/BuyViewController.swift index 397c8c4..58ee23c 100755 --- a/Surf/BuyViewController.swift +++ b/Surf/BuyViewController.swift @@ -36,7 +36,7 @@ class ProductCell: PurchaseCell { var haveInfo:Bool = false @IBOutlet weak var production:UILabel! } -let buyKey = "com.abigt.Surf.buy" +let buyKey = "com.yarshure.Surf.buy" class ViewController: SFTableViewController { @@ -303,7 +303,7 @@ class ViewController: SFTableViewController { result(purched) }else { for inapp in rr.in_app { - if inapp.product_id == "com.abigt.Surf.Pro" { + if inapp.product_id == "com.yarshure.Surf.Pro" { print("version buy version > 3.2 ,buy \(inapp.product_id)") purched = true break diff --git a/Surf/ConfigTableViewController.swift b/Surf/ConfigTableViewController.swift index 2c3c264..e9a1204 100644 --- a/Surf/ConfigTableViewController.swift +++ b/Surf/ConfigTableViewController.swift @@ -71,7 +71,7 @@ class ConfigTableViewController: SFTableViewController,LoglevelDelegate ,AddEdit } if let p = path { - let q = DispatchQueue(label:"com.abigt.config") + let q = DispatchQueue(label:"com.yarshure.config") q.async ( execute: { [unowned self] in self.config = SFConfig.init(path: p,loadRule: true) DispatchQueue.main.async(execute:{ diff --git a/Surf/DataShare.swift b/Surf/DataShare.swift index 9c6b79a..34f5bbc 100644 --- a/Surf/DataShare.swift +++ b/Surf/DataShare.swift @@ -21,7 +21,7 @@ class DataShare:NSObject{ } static func configPath() ->String{ - let urlContain = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.com.abigt.Surf") + let urlContain = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.com.yarshure.Surf") let url = urlContain!.appendingPathComponent(".config") let u = url.path return u diff --git a/Surf/Info.plist b/Surf/Info.plist index 4fa98b2..3ff4811 100644 --- a/Surf/Info.plist +++ b/Surf/Info.plist @@ -15,7 +15,7 @@ A.BIG.T Config LSItemContentTypes - run.abigt.conf + run.yarshure.conf @@ -82,7 +82,7 @@ NSUbiquitousContainers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf NSUbiquitousContainerIsDocumentScopePublic diff --git a/Surf/LogFileViewController.swift b/Surf/LogFileViewController.swift index a4db1d8..c8b96ec 100644 --- a/Surf/LogFileViewController.swift +++ b/Surf/LogFileViewController.swift @@ -14,7 +14,7 @@ class LogFileViewController: SFViewController,MFMailComposeViewControllerDelegat var filePath:URL? var showRouter:Bool = false - var queue = DispatchQueue(label:"com.abigt.route") + var queue = DispatchQueue(label:"com.yarshure.route") @IBOutlet weak var textView:UITextView? override func viewDidLoad() { diff --git a/Surf/LogListTableViewController.swift b/Surf/LogListTableViewController.swift index 780b0e8..10e21d3 100644 --- a/Surf/LogListTableViewController.swift +++ b/Surf/LogListTableViewController.swift @@ -210,11 +210,11 @@ class LogListTableViewController: SFTableViewController { findFiles() } func findFiles(){ - let q = DispatchQueue(label:"com.abigt.sortlog") + let q = DispatchQueue(label:"com.yarshure.sortlog") q.async(execute: { [weak self] () -> Void in self!.fileList.removeAll() - //let urlContain = FileManager.default.containerURLForSecurityApplicationGroupIdentifier("group.com.abigt.Surf") + //let urlContain = FileManager.default.containerURLForSecurityApplicationGroupIdentifier("group.com.yarshure.Surf") let url = groupContainerURL().appendingPathComponent("Log/" + self!.filePath) let dir = url.path //NSHomeDirectory().NS.stringByAppendingPathComponent("Documents/applog") diff --git a/Surf/ProxyGroupViewController.swift b/Surf/ProxyGroupViewController.swift index a1f9942..a227626 100644 --- a/Surf/ProxyGroupViewController.swift +++ b/Surf/ProxyGroupViewController.swift @@ -65,7 +65,7 @@ class ProxyGroupViewController: SFTableViewController,BarcodeScanDelegate,AddEdi //UIImagePickerControllerDelegate,UINavigationControllerDelegate { - let dnsqueue:DispatchQueue = DispatchQueue(label:"com.abigt.dns") + let dnsqueue:DispatchQueue = DispatchQueue(label:"com.yarshure.dns") let coreFuncs = ["Aid","start"] let coreFuncsTitles = ["Connect"] var titleView:TitleView? @@ -318,7 +318,7 @@ class ProxyGroupViewController: SFTableViewController,BarcodeScanDelegate,AddEdi if let re = ProxyGroupSettings.share.receipt { for item in re.in_app { - if item.product_id == "com.abigt.Surf.30D"{ + if item.product_id == "com.yarshure.Surf.30D"{ let now = Date().timeIntervalSince1970 let x = Double(item.original_purchase_date_ms)!/1000 + 30 * 24*3600 let df = DateFormatter() @@ -420,7 +420,7 @@ class ProxyGroupViewController: SFTableViewController,BarcodeScanDelegate,AddEdi func showScan(){ let queue = DispatchQueue.init(label: ".", qos: .background, attributes: .concurrent, autoreleaseFrequency: .inherit, target: nil) - //let queue = DispatchQueue(label: "com.abigt.socket")// DISPATCH_QUEUE_CONCURRENT) + //let queue = DispatchQueue(label: "com.yarshure.socket")// DISPATCH_QUEUE_CONCURRENT) for p in ProxyGroupSettings.share.proxys { if p.kcptun { @@ -496,7 +496,7 @@ class ProxyGroupViewController: SFTableViewController,BarcodeScanDelegate,AddEdi func showScanXXX(){ let queue = DispatchQueue.init(label: "test.http", qos: .background, attributes: .concurrent, autoreleaseFrequency: .inherit, target: nil) - //let queue = DispatchQueue(label: "com.abigt.socket")// DISPATCH_QUEUE_CONCURRENT) + //let queue = DispatchQueue(label: "com.yarshure.socket")// DISPATCH_QUEUE_CONCURRENT) queue.async(execute: { diff --git a/Surf/SFConfigViewController.swift b/Surf/SFConfigViewController.swift index c56e2e2..51eb3f2 100644 --- a/Surf/SFConfigViewController.swift +++ b/Surf/SFConfigViewController.swift @@ -114,7 +114,7 @@ class SFConfigListViewController : SFTableViewController ,ConfigTableViewControl } // func loadConfigSummery(fName:String){ -// let q = dispatch_queue_create("com.abigt.config", nil) +// let q = dispatch_queue_create("com.yarshure.config", nil) // dispatch_async(q){[weak self] in // if let StrongSelf = self{ // let configURL = applicationDocumentsDirectory.appendingPathComponent(fName) diff --git a/Surf/SFRuleHelper.swift b/Surf/SFRuleHelper.swift index 6ba30be..80d7695 100644 --- a/Surf/SFRuleHelper.swift +++ b/Surf/SFRuleHelper.swift @@ -112,7 +112,7 @@ class SFRuleHelper{ func initDatabase(db:Connection) { let bId = Bundle.main.infoDictionary!["CFBundleIdentifier"] as! String - if bId == "com.abigt.Surf" { + if bId == "com.yarshure.Surf" { // let rules = Table("rules") // diff --git a/Surf/SFTableViewController.swift b/Surf/SFTableViewController.swift index 55259c5..9e69200 100644 --- a/Surf/SFTableViewController.swift +++ b/Surf/SFTableViewController.swift @@ -26,7 +26,7 @@ enum RegisteredPurchase: String { case nonRenewingPurchase } open class SFTableViewController: UITableViewController { - let appBundleId = "com.abigt.Surf" + let appBundleId = "com.yarshure.Surf" func dataForShare(filePath:URL?) ->Data? { guard let u = filePath else { diff --git a/Surf/SFVPNManager.swift b/Surf/SFVPNManager.swift index d0f22db..36d97ad 100644 --- a/Surf/SFVPNManager.swift +++ b/Surf/SFVPNManager.swift @@ -42,7 +42,7 @@ extension NEVPNStatus: CustomStringConvertible { class SFNETunnelProviderManager:NETunnelProviderManager { - //var pluginType:String = "com.abigt.Surf" + //var pluginType:String = "com.yarshure.Surf" class func loadOrCreateDefaultWithCompletionHandler(_ completionHandler: ((NETunnelProviderManager?, Error?) -> Void)?) { self.loadAllFromPreferences { (managers, error) -> Void in if let error = error { @@ -78,24 +78,24 @@ class SFNETunnelProviderManager:NETunnelProviderManager { } let config = NETunnelProviderProtocol() - config.providerConfiguration = ["App": bId,"PluginType":"com.abigt.Surf"] + config.providerConfiguration = ["App": bId,"PluginType":"com.yarshure.Surf"] #if os(iOS) - config.providerBundleIdentifier = "com.abigt.Surf4.PacketTunnel" + config.providerBundleIdentifier = "com.yarshure.Surf4.PacketTunnel" #else - config.providerBundleIdentifier = "com.abigt.Surf.mac.extension" + config.providerBundleIdentifier = "com.yarshure.Surf.mac.extension" #endif config.serverAddress = "240.84.1.24" let manager = SFNETunnelProviderManager() manager.protocolConfiguration = config - if bId == "com.abigt.Surf" { + if bId == "com.yarshure.Surf" { manager.localizedDescription = "Surfing" }else { manager.localizedDescription = "Surfing Today" } - //manager.setPluginType("com.abigt.Surf") + //manager.setPluginType("com.yarshure.Surf") // manager. // manager.onDemandEnabled = true // manager.onDemandRules = [NEOnDemandRule]() @@ -335,7 +335,7 @@ class SFVPNManager { if let m = manager { m.isEnabled = true let bId = Bundle.main.infoDictionary!["CFBundleIdentifier"] as! String - if bId == "com.abigt.Surf" { + if bId == "com.yarshure.Surf" { m.localizedDescription = "Surfing" }else { m.localizedDescription = "Surfing Today" diff --git a/Surf/SFVerify.swift b/Surf/SFVerify.swift index cd062d9..0283fec 100644 --- a/Surf/SFVerify.swift +++ b/Surf/SFVerify.swift @@ -60,7 +60,7 @@ extension SFTableViewController { if let receipt = ProxyGroupSettings.share.receipt { for inapp in receipt.in_app { print("inapp buy \(inapp.product_id)") - if inapp.product_id == "com.abigt.Surf." + product.rawValue || inapp.product_id == "com.abigt.Surf.Pro"{ + if inapp.product_id == "com.yarshure.Surf." + product.rawValue || inapp.product_id == "com.yarshure.Surf.Pro"{ print("version buy version > 3.2 ,buy") return true //break @@ -158,7 +158,7 @@ extension SFTableViewController { }else { for inapp in rr.in_app { print("inapp buy \(inapp.product_id)") - if inapp.product_id == "com.abigt.Surf." + product.rawValue { + if inapp.product_id == "com.yarshure.Surf." + product.rawValue { print("version buy version > 3.2 ,buy") purched = true break diff --git a/Surf/Surf.entitlements b/Surf/Surf.entitlements index 94aa2de..592edfe 100644 --- a/Surf/Surf.entitlements +++ b/Surf/Surf.entitlements @@ -6,7 +6,7 @@ development com.apple.developer.icloud-container-identifiers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf com.apple.developer.icloud-services @@ -26,15 +26,15 @@ com.apple.developer.ubiquity-container-identifiers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf com.apple.security.application-groups - group.com.abigt.Surf + group.com.yarshure.Surf keychain-access-groups - $(AppIdentifierPrefix)com.abigt.Surf + $(AppIdentifierPrefix)com.yarshure.Surf diff --git a/Surf/const.swift b/Surf/const.swift index e00f7e7..0871a97 100644 --- a/Surf/const.swift +++ b/Surf/const.swift @@ -17,15 +17,15 @@ let DefaultConfig = "Default.conf" #if os(iOS) -let groupIdentifier = "group.com.abigt.Surf" +let groupIdentifier = "group.com.yarshure.Surf" #else - let groupIdentifier = "745WQDK4L7.com.abigt.Surf" + let groupIdentifier = "745WQDK4L7.com.yarshure.Surf" #endif let configExt = ".conf" -let packetconfig = "group.com.abigt.config" -let flagconfig = "group.com.abigt.flag" -let onDemandKey = "com.abigt.onDemandKey" -let errDomain = "com.abigt.socket" +let packetconfig = "group.com.yarshure.config" +let flagconfig = "group.com.yarshure.flag" +let onDemandKey = "com.yarshure.onDemandKey" +let errDomain = "com.yarshure.socket" let fm = FileManager.default //#if os(iOS) @@ -52,11 +52,11 @@ let kProxyGroup = "ProxyGroup" let kProxyGroupFile = ".ProxyGroup" var groupContainerURLVPN:String = "" -let iOSAppIden = "com.abigt.Surf" -let iOSTodayIden = "com.abigt.Surf.SurfToday" -let MacAppIden = "com.abigt.Surf.mac" -let MacTunnelIden = "com.abigt.Surf.mac.extension" -let iOSTunnelIden = "com.abigt.Surf.PacketTunnel" +let iOSAppIden = "com.yarshure.Surf" +let iOSTodayIden = "com.yarshure.Surf.SurfToday" +let MacAppIden = "com.yarshure.Surf.mac" +let MacTunnelIden = "com.yarshure.Surf.mac.extension" +let iOSTunnelIden = "com.yarshure.Surf.PacketTunnel" let configMacFn = "abigt.conf" let NOTIFY_SERVER_PROFILES_CHANGED = "NOTIFY_SERVER_PROFILES_CHANGED" diff --git a/SurfToday/TodayViewController.swift b/SurfToday/TodayViewController.swift index 6982610..da070f2 100644 --- a/SurfToday/TodayViewController.swift +++ b/SurfToday/TodayViewController.swift @@ -58,7 +58,7 @@ class TodayViewController: SFTableViewController, NCWidgetProviding { var showServerHost = false var lastTraffic:STTraffic = DataCounters("240.7.1.9") var timer:Timer? - let dnsqueue:DispatchQueue = DispatchQueue(label: "com.abigt.dns") + let dnsqueue:DispatchQueue = DispatchQueue(label: "com.yarshure.dns") var autoRedail = false let reachability = Reachability()! var charts:[Double] = [] @@ -787,7 +787,7 @@ class TodayViewController: SFTableViewController, NCWidgetProviding { // tableView.reloadData() } func closeTun(){ - let queue = DispatchQueue(label:"com.abigt.socket")//, DISPATCH_QUEUE_CONCURRENT + let queue = DispatchQueue(label:"com.yarshure.socket")//, DISPATCH_QUEUE_CONCURRENT queue.async( execute: { //let start = NSDate() @@ -916,7 +916,7 @@ class TodayViewController: SFTableViewController, NCWidgetProviding { extension TodayViewController{ func tcpScan(){ - let queue = DispatchQueue(label: "com.abigt.socket")//, DISPATCH_QUEUE_CONCURRENT) + let queue = DispatchQueue(label: "com.yarshure.socket")//, DISPATCH_QUEUE_CONCURRENT) for p in ProxyGroupSettings.share.proxys { print(p.showString() + " now scan " ) if p.kcptun { diff --git a/SurfToday/today.entitlements b/SurfToday/today.entitlements index 5df8f2b..8c8dea2 100644 --- a/SurfToday/today.entitlements +++ b/SurfToday/today.entitlements @@ -13,7 +13,7 @@ com.apple.security.application-groups - group.com.abigt.Surf + group.com.yarshure.Surf com.apple.developer.networking.HotspotHelper From 669099a150b5b7f94c967a218bba7095bd4406ed Mon Sep 17 00:00:00 2001 From: networkextension Date: Fri, 16 Feb 2018 23:04:30 +0800 Subject: [PATCH 2/4] update Readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 6d35ba5..c89c521 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,13 @@ * ... * ... * ... +""" +$ xcodebuild -target PacketTunnel-iOS +$xcodebuild -target SurfToday +$xcodebuild +$ls build/Release-iphoneos/Surf.app +""" + * Deployment instructions ### Contribution guidelines ### From 7dda39b0e3b1f514cb5b29522e467723352e9a0b Mon Sep 17 00:00:00 2001 From: networkextension Date: Fri, 16 Feb 2018 23:28:41 +0800 Subject: [PATCH 3/4] change use codable --- Surf-Mac/StatusView.swift | 2 +- Surf-Today/RequestsWindowController.swift | 2 +- Surf.xcodeproj/project.pbxproj | 52 ----------- Surf/AnalyzeTableViewController.swift | 2 +- Surf/LogListTableViewController.swift | 2 +- Surf/RecentReqViewController.swift | 2 +- Surf/RequestDetailViewController.swift | 2 +- Surf/RuleResultsViewController.swift | 2 +- Surf/SFCountry.swift | 2 +- SurfToday/TodayViewController.swift | 2 +- XDataService/RequestsBasic.swift | 106 +++++++++++----------- 11 files changed, 62 insertions(+), 114 deletions(-) diff --git a/Surf-Mac/StatusView.swift b/Surf-Mac/StatusView.swift index 26d4d4b..e25a3ec 100644 --- a/Surf-Mac/StatusView.swift +++ b/Surf-Mac/StatusView.swift @@ -10,7 +10,7 @@ import Cocoa import SFSocket import XRuler import NetworkExtension -import SwiftyJSON + class StatusView: NSView { var report:SFVPNStatistics = SFVPNStatistics.shared var reportTimer:Timer? diff --git a/Surf-Today/RequestsWindowController.swift b/Surf-Today/RequestsWindowController.swift index 4c09eeb..fbd4062 100644 --- a/Surf-Today/RequestsWindowController.swift +++ b/Surf-Today/RequestsWindowController.swift @@ -7,7 +7,7 @@ // import Cocoa -import SwiftyJSON + import NetworkExtension import SFSocket import XProxy diff --git a/Surf.xcodeproj/project.pbxproj b/Surf.xcodeproj/project.pbxproj index 27c7d1d..bfa94b7 100644 --- a/Surf.xcodeproj/project.pbxproj +++ b/Surf.xcodeproj/project.pbxproj @@ -51,9 +51,6 @@ 690AB87E1E9764F1001A6C3A /* AxLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E5E1DD97B640047112C /* AxLogger.framework */; }; 690AB87F1E9764F1001A6C3A /* AxLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E5E1DD97B640047112C /* AxLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 690AB8811E9764F6001A6C3A /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E5C1DD97B5D0047112C /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 690AB8851E97652F001A6C3A /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 690AB8841E97652F001A6C3A /* ObjectMapper.framework */; }; - 690AB8861E97652F001A6C3A /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 690AB8841E97652F001A6C3A /* ObjectMapper.framework */; }; - 690AB8881E976534001A6C3A /* ObjectMapper.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 690AB8841E97652F001A6C3A /* ObjectMapper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 690C64D01D66BB9F00FB9BA7 /* SFactivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 690C64CF1D66BB9F00FB9BA7 /* SFactivity.swift */; }; 690C64D31D67670B00FB9BA7 /* SFConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 690C64D21D67670B00FB9BA7 /* SFConfigManager.swift */; }; 690C77C11CF42FF100EB1610 /* Default.conf in Resources */ = {isa = PBXBuildFile; fileRef = 690C77C01CF42FF100EB1610 /* Default.conf */; }; @@ -133,7 +130,6 @@ 693AAE53200EE710009E481E /* Xcon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69DA26B12007AC060044FA53 /* Xcon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE57200EE71A009E481E /* SFSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69263EF81EE50C5B005F0C76 /* SFSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE59200EE71E009E481E /* snappy.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69263EEB1EE50491005F0C76 /* snappy.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 693AAE5B200EE723009E481E /* ObjectMapper.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69BCD77D1EE469D100A8A19C /* ObjectMapper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE5D200EE727009E481E /* GRDB.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 694397B71E5C37FE0009AD0E /* GRDB.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE5F200EE729009E481E /* kcp.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69639C231EE1C34400893D18 /* kcp.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE61200EE72D009E481E /* AxLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3B1DE0A467007E32C2 /* AxLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -144,7 +140,6 @@ 693AAE6B200EE73B009E481E /* lwip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D411DE0A467007E32C2 /* lwip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE6D200EE742009E481E /* MMDB.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D421DE0A467007E32C2 /* MMDB.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE6F200EE744009E481E /* Sodium.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D441DE0A467007E32C2 /* Sodium.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 693AAE71200EE747009E481E /* SwiftyJSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE73200EE749009E481E /* SystemKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D461DE0A467007E32C2 /* SystemKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 693AAE77200EEA3C009E481E /* MainWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693AAE76200EEA3C009E481E /* MainWindow.swift */; }; 693AAE79200EED15009E481E /* RequestBasic.xib in Resources */ = {isa = PBXBuildFile; fileRef = 693AAE78200EED15009E481E /* RequestBasic.xib */; }; @@ -202,7 +197,6 @@ 696573F51DE4959B00D95D59 /* TodayViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 696573F31DE4959B00D95D59 /* TodayViewController.xib */; }; 696573F91DE4959B00D95D59 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 696573F71DE4959B00D95D59 /* InfoPlist.strings */; }; 696574001DE497B100D95D59 /* SFVPNManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695BBDD81C64823900879ABB /* SFVPNManager.swift */; }; - 696574021DE4984D00D95D59 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */; }; 696574031DE4985D00D95D59 /* const.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693B603E1C48867500173D0B /* const.swift */; }; 696574081DE49FEA00D95D59 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69366E621BFECBE700AE123D /* Assets.xcassets */; }; 6965AA761C56056C00F38B8D /* TwoLableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6965AA751C56056C00F38B8D /* TwoLableCell.swift */; }; @@ -236,7 +230,6 @@ 69784D4E1DE0A467007E32C2 /* lwip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D411DE0A467007E32C2 /* lwip.framework */; }; 69784D4F1DE0A467007E32C2 /* MMDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D421DE0A467007E32C2 /* MMDB.framework */; }; 69784D511DE0A467007E32C2 /* Sodium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D441DE0A467007E32C2 /* Sodium.framework */; }; - 69784D521DE0A467007E32C2 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */; }; 69784D541DE0A7F6007E32C2 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3A1DE0A467007E32C2 /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69784D561DE0A7FB007E32C2 /* CocoaAsyncSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3C1DE0A467007E32C2 /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69784D571DE0A7FD007E32C2 /* CommonCrypto.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3D1DE0A467007E32C2 /* CommonCrypto.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -245,7 +238,6 @@ 69784D5B1DE0A80F007E32C2 /* lwip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D411DE0A467007E32C2 /* lwip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69784D5C1DE0A811007E32C2 /* MMDB.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D421DE0A467007E32C2 /* MMDB.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69784D5E1DE0A818007E32C2 /* Sodium.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D441DE0A467007E32C2 /* Sodium.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 69784D5F1DE0A81A007E32C2 /* SwiftyJSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69784D641DE0A8DE007E32C2 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3A1DE0A467007E32C2 /* Alamofire.framework */; }; 69784D651DE0A8DE007E32C2 /* AxLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3B1DE0A467007E32C2 /* AxLogger.framework */; }; 69784D661DE0A8DE007E32C2 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3C1DE0A467007E32C2 /* CocoaAsyncSocket.framework */; }; @@ -255,7 +247,6 @@ 69784D6B1DE0A8DE007E32C2 /* lwip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D411DE0A467007E32C2 /* lwip.framework */; }; 69784D6C1DE0A8DE007E32C2 /* MMDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D421DE0A467007E32C2 /* MMDB.framework */; }; 69784D6E1DE0A8DE007E32C2 /* Sodium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D441DE0A467007E32C2 /* Sodium.framework */; }; - 69784D6F1DE0A8DE007E32C2 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */; }; 69784D701DE0A8DE007E32C2 /* SystemKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D461DE0A467007E32C2 /* SystemKit.framework */; }; 697B7C3F1DDF41F400584179 /* MMDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 697B7C3D1DDF41F400584179 /* MMDB.framework */; }; 697DF0801FFE0C8A00C6A64C /* SurfToday.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 692D8CF71C6A250400C07B3A /* SurfToday.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -292,8 +283,6 @@ 69BCD7781EE1CA5300A8A19C /* SystemKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D461DE0A467007E32C2 /* SystemKit.framework */; }; 69BCD7791EE1CA5300A8A19C /* SystemKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D461DE0A467007E32C2 /* SystemKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69BCD77B1EE1CA7700A8A19C /* AxLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69784D3B1DE0A467007E32C2 /* AxLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 69BCD77F1EE469FB00A8A19C /* ObjectMapper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69BCD77D1EE469D100A8A19C /* ObjectMapper.framework */; }; - 69BCD7801EE469FB00A8A19C /* ObjectMapper.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69BCD77D1EE469D100A8A19C /* ObjectMapper.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69BD54C51E975C88008F10DC /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69BD54C41E975C88008F10DC /* Reachability.framework */; }; 69BD54C61E975C88008F10DC /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69BD54C41E975C88008F10DC /* Reachability.framework */; }; 69BD736D1DB4B3740078EB02 /* imageView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 69BD736B1DB4B3740078EB02 /* imageView.storyboard */; }; @@ -348,12 +337,9 @@ 69DA26C72007ACE20044FA53 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69DA26C62007ACDE0044FA53 /* Reachability.framework */; }; 69DA26C82007AD2F0044FA53 /* Reachability.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69DA26C62007ACDE0044FA53 /* Reachability.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69DA64E71C2920FE00DC174C /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 578ED92D1C03181300913B2F /* PacketTunnelProvider.swift */; }; - 69DD43271DDC2D4800080CF1 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E6C1DD97BA50047112C /* SwiftyJSON.framework */; }; 69DD43621DDC53A500080CF1 /* GRDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69ED92B61DD9AF9500D51369 /* GRDB.framework */; }; 69DD43631DDC53A500080CF1 /* GRDB.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69ED92B61DD9AF9500D51369 /* GRDB.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69DD43641DDC53AD00080CF1 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E5C1DD97B5D0047112C /* Alamofire.framework */; }; - 69DD43661DDC53C000080CF1 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E6C1DD97BA50047112C /* SwiftyJSON.framework */; }; - 69DD43671DDC53C000080CF1 /* SwiftyJSON.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E6C1DD97BA50047112C /* SwiftyJSON.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69DD436A1DDC540800080CF1 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E601DD97B6F0047112C /* CocoaAsyncSocket.framework */; }; 69DD436B1DDC540800080CF1 /* CocoaAsyncSocket.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E601DD97B6F0047112C /* CocoaAsyncSocket.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 69DD436C1DDC540A00080CF1 /* Crypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69803E641DD97B820047112C /* Crypto.framework */; }; @@ -424,13 +410,11 @@ dstSubfolderSpec = 10; files = ( 693AAE48200EE6BF009E481E /* XRuler.framework in Embed Frameworks */, - 693AAE5B200EE723009E481E /* ObjectMapper.framework in Embed Frameworks */, 693AAE46200EE6BB009E481E /* XSocket.framework in Embed Frameworks */, 693AAE67200EE736009E481E /* Crypto.framework in Embed Frameworks */, 6907E9CC20117FE600E7B1FE /* Sparkle.framework in Embed Frameworks */, 693AAE44200EE6B9009E481E /* XFoundation.framework in Embed Frameworks */, 693AAE3B200EE646009E481E /* XDataService.framework in Embed Frameworks */, - 693AAE71200EE747009E481E /* SwiftyJSON.framework in Embed Frameworks */, 693AAE42200EE6B6009E481E /* XProxy.framework in Embed Frameworks */, 693AAE59200EE71E009E481E /* snappy.framework in Embed Frameworks */, 693AAE5F200EE729009E481E /* kcp.framework in Embed Frameworks */, @@ -466,7 +450,6 @@ 69348F431FFB7234007C841C /* XRuler.framework in Embed Frameworks */, 69348F3F1FFB7234007C841C /* Xcon.framework in Embed Frameworks */, 69852BE91F33010A00EBFC92 /* IoniconsSwift.framework in Embed Frameworks */, - 69DD43671DDC53C000080CF1 /* SwiftyJSON.framework in Embed Frameworks */, 6906B76E1EF36BA600CA66CA /* SwiftyStoreKit.framework in Embed Frameworks */, 69639BCF1EE179B400893D18 /* kcp.framework in Embed Frameworks */, 69D411B01E975DC30095E683 /* Reachability.framework in Embed Frameworks */, @@ -474,7 +457,6 @@ 69852BEB1F3313FE00EBFC92 /* SystemKitiOS.framework in Embed Frameworks */, 69348F411FFB7234007C841C /* XProxy.framework in Embed Frameworks */, 691883501DDDA03C0051DAAE /* lwip.framework in Embed Frameworks */, - 690AB8881E976534001A6C3A /* ObjectMapper.framework in Embed Frameworks */, 6906B75D1EF2728200CA66CA /* SFSocket.framework in Embed Frameworks */, 69303FCB1ECA99940089AFFA /* snappy.framework in Embed Frameworks */, 69DD43711DDC540E00080CF1 /* Sodium.framework in Embed Frameworks */, @@ -519,13 +501,11 @@ 69DA26C82007AD2F0044FA53 /* Reachability.framework in Embed Frameworks */, 69BCD77B1EE1CA7700A8A19C /* AxLogger.framework in Embed Frameworks */, 694397BB1E5C38170009AD0E /* GRDB.framework in Embed Frameworks */, - 69784D5F1DE0A81A007E32C2 /* SwiftyJSON.framework in Embed Frameworks */, 69263EF31EE504BA005F0C76 /* snappy.framework in Embed Frameworks */, 69784D5C1DE0A811007E32C2 /* MMDB.framework in Embed Frameworks */, 69784D5B1DE0A80F007E32C2 /* lwip.framework in Embed Frameworks */, 693AAE2D200EDF82009E481E /* XDataService.framework in Embed Frameworks */, 69784D571DE0A7FD007E32C2 /* CommonCrypto.framework in Embed Frameworks */, - 69BCD7801EE469FB00A8A19C /* ObjectMapper.framework in Embed Frameworks */, 69784D561DE0A7FB007E32C2 /* CocoaAsyncSocket.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -560,7 +540,6 @@ 6907E9CD201180DB00E7B1FE /* UpdateWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateWindowController.swift; sourceTree = ""; }; 6907E9D12011815100E7B1FE /* SUUpdateSettingsWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUUpdateSettingsWindowController.xib; sourceTree = ""; }; 6907E9D32011959E00E7B1FE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 690AB8841E97652F001A6C3A /* ObjectMapper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjectMapper.framework; path = Carthage/Build/iOS/ObjectMapper.framework; sourceTree = ""; }; 690C64CF1D66BB9F00FB9BA7 /* SFactivity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFactivity.swift; sourceTree = ""; }; 690C64D21D67670B00FB9BA7 /* SFConfigManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFConfigManager.swift; sourceTree = ""; }; 690C77C01CF42FF100EB1610 /* Default.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Default.conf; sourceTree = ""; }; @@ -708,7 +687,6 @@ 69784D411DE0A467007E32C2 /* lwip.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = lwip.framework; path = Carthage/Build/Mac/lwip.framework; sourceTree = ""; }; 69784D421DE0A467007E32C2 /* MMDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MMDB.framework; path = Carthage/Build/Mac/MMDB.framework; sourceTree = ""; }; 69784D441DE0A467007E32C2 /* Sodium.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sodium.framework; path = Carthage/Build/Mac/Sodium.framework; sourceTree = ""; }; - 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/Mac/SwiftyJSON.framework; sourceTree = ""; }; 69784D461DE0A467007E32C2 /* SystemKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemKit.framework; path = Carthage/Build/Mac/SystemKit.framework; sourceTree = ""; }; 697B7C3D1DDF41F400584179 /* MMDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MMDB.framework; path = Carthage/Build/iOS/MMDB.framework; sourceTree = ""; }; 69801C95200D947400A214D6 /* BarChatsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarChatsCell.swift; sourceTree = ""; }; @@ -718,7 +696,6 @@ 69803E621DD97B780047112C /* CommonCrypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommonCrypto.framework; path = Carthage/Build/iOS/CommonCrypto.framework; sourceTree = ""; }; 69803E641DD97B820047112C /* Crypto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crypto.framework; path = Carthage/Build/iOS/Crypto.framework; sourceTree = ""; }; 69803E6A1DD97BA00047112C /* Sodium.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sodium.framework; path = Carthage/Build/iOS/Sodium.framework; sourceTree = ""; }; - 69803E6C1DD97BA50047112C /* SwiftyJSON.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftyJSON.framework; path = Carthage/Build/iOS/SwiftyJSON.framework; sourceTree = ""; }; 6983C0C31DF4F5B600100E70 /* About.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = About.xib; sourceTree = ""; }; 6983C0C51DF4F61500100E70 /* AboutWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutWindowController.swift; sourceTree = ""; }; 6983C0E41DF4FED300100E70 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; @@ -745,7 +722,6 @@ 69AD9CC7200354A100C01011 /* XFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XFoundation.framework; path = Carthage/Build/iOS/XFoundation.framework; sourceTree = ""; }; 69B3D9801D2DFFFC00E1626C /* SFInterfaceTraffic.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SFInterfaceTraffic.swift; path = ../Surf/SFInterfaceTraffic.swift; sourceTree = ""; }; 69BBD6421CD9C8A500DB8CBC /* SFRuleHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SFRuleHelper.swift; sourceTree = ""; }; - 69BCD77D1EE469D100A8A19C /* ObjectMapper.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjectMapper.framework; path = Carthage/Build/Mac/ObjectMapper.framework; sourceTree = ""; }; 69BD54C41E975C88008F10DC /* Reachability.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reachability.framework; path = Carthage/Build/iOS/Reachability.framework; sourceTree = ""; }; 69BD736B1DB4B3740078EB02 /* imageView.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = imageView.storyboard; sourceTree = ""; }; 69BD736C1DB4B3740078EB02 /* ImageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewController.swift; sourceTree = ""; }; @@ -797,7 +773,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 690AB8861E97652F001A6C3A /* ObjectMapper.framework in Frameworks */, 6903CDD820159D2400642B68 /* Crashlytics.framework in Frameworks */, 697B7C3F1DDF41F400584179 /* MMDB.framework in Frameworks */, 693B744B1ED9FA69004C6E87 /* SFSocket.framework in Frameworks */, @@ -816,7 +791,6 @@ 697DF0821FFE0D0500C6A64C /* Fabric.framework in Frameworks */, 69743A0B202C96E2003A0CE6 /* Charts.framework in Frameworks */, 69524B051D2E091C00FA4DC7 /* CFNetwork.framework in Frameworks */, - 69DD43271DDC2D4800080CF1 /* SwiftyJSON.framework in Frameworks */, 693B744C1ED9FA69004C6E87 /* SFSocket.framework in Frameworks */, 69524B031D2E08F100FA4DC7 /* SystemConfiguration.framework in Frameworks */, 692D8CFA1C6A250400C07B3A /* NotificationCenter.framework in Frameworks */, @@ -839,7 +813,6 @@ 6906B7661EF36B5B00CA66CA /* SwiftyStoreKit.framework in Frameworks */, 696702141CFBE6A8008D36C8 /* SystemConfiguration.framework in Frameworks */, 690AB8761E9764A9001A6C3A /* MMDB.framework in Frameworks */, - 690AB8851E97652F001A6C3A /* ObjectMapper.framework in Frameworks */, 69852BEA1F3313FE00EBFC92 /* SystemKitiOS.framework in Frameworks */, 69639BC71EE1636700893D18 /* DarwinCore.framework in Frameworks */, 69DD43701DDC540E00080CF1 /* Sodium.framework in Frameworks */, @@ -849,7 +822,6 @@ 69AD9CC8200354A100C01011 /* XFoundation.framework in Frameworks */, 69348F3E1FFB7234007C841C /* Xcon.framework in Frameworks */, 69DD436C1DDC540A00080CF1 /* Crypto.framework in Frameworks */, - 69DD43661DDC53C000080CF1 /* SwiftyJSON.framework in Frameworks */, 69348F3D1FFB7214007C841C /* XSocket.framework in Frameworks */, 69639BCE1EE179B400893D18 /* kcp.framework in Frameworks */, 69DD436A1DDC540800080CF1 /* CocoaAsyncSocket.framework in Frameworks */, @@ -890,7 +862,6 @@ 69DA26B02007ABFB0044FA53 /* XRuler.framework in Frameworks */, 696573ED1DE4959B00D95D59 /* NotificationCenter.framework in Frameworks */, 69DA26AB2007A96B0044FA53 /* Fabric.framework in Frameworks */, - 696574021DE4984D00D95D59 /* SwiftyJSON.framework in Frameworks */, 69DA26A82007A96B0044FA53 /* Crashlytics.framework in Frameworks */, 695234331E35A4350049EB94 /* DarwinCore.framework in Frameworks */, 69DA26B82007AC0F0044FA53 /* XSocket.framework in Frameworks */, @@ -904,13 +875,11 @@ buildActionMask = 2147483647; files = ( 694397BA1E5C38170009AD0E /* GRDB.framework in Frameworks */, - 69784D521DE0A467007E32C2 /* SwiftyJSON.framework in Frameworks */, 69DA26B62007AC0F0044FA53 /* XSocket.framework in Frameworks */, 69DA26AE2007ABFB0044FA53 /* XRuler.framework in Frameworks */, 69784D4F1DE0A467007E32C2 /* MMDB.framework in Frameworks */, 69DA26A92007A96B0044FA53 /* Fabric.framework in Frameworks */, 69784D511DE0A467007E32C2 /* Sodium.framework in Frameworks */, - 69BCD77F1EE469FB00A8A19C /* ObjectMapper.framework in Frameworks */, 69784D4E1DE0A467007E32C2 /* lwip.framework in Frameworks */, 69639C241EE1C34400893D18 /* kcp.framework in Frameworks */, 6947D76D1CE4CC340020BBCB /* libresolv.tbd in Frameworks */, @@ -953,7 +922,6 @@ 69784D6E1DE0A8DE007E32C2 /* Sodium.framework in Frameworks */, 69DA26B32007AC070044FA53 /* Xcon.framework in Frameworks */, 69DA26BB2007AC190044FA53 /* XFoundation.framework in Frameworks */, - 69784D6F1DE0A8DE007E32C2 /* SwiftyJSON.framework in Frameworks */, 69DA26BF2007AC2B0044FA53 /* XProxy.framework in Frameworks */, 6906B9031DE1955400A60B66 /* NetworkExtension.framework in Frameworks */, 69DA26AA2007A96B0044FA53 /* Fabric.framework in Frameworks */, @@ -1034,7 +1002,6 @@ 69366E581BFECBE700AE123D /* Surf */, 578ED92A1C03181300913B2F /* PacketTunnel */, 69C4EE2A1C2919010020FBF8 /* Surf-Mac */, - 6989A5001C31042D00DD1435 /* TunServerUI */, 692D8CFB1C6A250400C07B3A /* SurfToday */, 696573EE1DE4959B00D95D59 /* Surf-Today */, 693AAE0F200EDA4E009E481E /* Kwazii */, @@ -1143,7 +1110,6 @@ 6918834E1DDDA0280051DAAE /* lwip.framework */, 69F698E91DDC21ED00966272 /* DarwinCore.framework */, 69ED92B61DD9AF9500D51369 /* GRDB.framework */, - 69803E6C1DD97BA50047112C /* SwiftyJSON.framework */, 69803E6A1DD97BA00047112C /* Sodium.framework */, 69803E641DD97B820047112C /* Crypto.framework */, 69803E621DD97B780047112C /* CommonCrypto.framework */, @@ -1164,7 +1130,6 @@ 693B744D1ED9FA7A004C6E87 /* kcp.framework */, 693B74491ED9FA69004C6E87 /* SFSocket.framework */, 69303FC21ECA99610089AFFA /* snappy.framework */, - 690AB8841E97652F001A6C3A /* ObjectMapper.framework */, 69D411AC1E975D6C0095E683 /* IDZSwiftCommonCrypto.framework */, 69BD54C41E975C88008F10DC /* Reachability.framework */, ); @@ -1245,7 +1210,6 @@ 69DA26A52007A96A0044FA53 /* Fabric.framework */, 69263EF81EE50C5B005F0C76 /* SFSocket.framework */, 69263EEB1EE50491005F0C76 /* snappy.framework */, - 69BCD77D1EE469D100A8A19C /* ObjectMapper.framework */, 69639C231EE1C34400893D18 /* kcp.framework */, 694397B71E5C37FE0009AD0E /* GRDB.framework */, 69784D3A1DE0A467007E32C2 /* Alamofire.framework */, @@ -1257,7 +1221,6 @@ 69784D411DE0A467007E32C2 /* lwip.framework */, 69784D421DE0A467007E32C2 /* MMDB.framework */, 69784D441DE0A467007E32C2 /* Sodium.framework */, - 69784D451DE0A467007E32C2 /* SwiftyJSON.framework */, 69784D461DE0A467007E32C2 /* SystemKit.framework */, ); name = MacFrameworks; @@ -1308,21 +1271,6 @@ name = config; sourceTree = ""; }; - 6989A5001C31042D00DD1435 /* TunServerUI */ = { - isa = PBXGroup; - children = ( - 6989A50F1C3105B800DD1435 /* server */, - ); - path = TunServerUI; - sourceTree = ""; - }; - 6989A50F1C3105B800DD1435 /* server */ = { - isa = PBXGroup; - children = ( - ); - name = server; - sourceTree = ""; - }; 6989AB031C312A3400DD1435 /* Shared */ = { isa = PBXGroup; children = ( diff --git a/Surf/AnalyzeTableViewController.swift b/Surf/AnalyzeTableViewController.swift index aff7f76..2b87bb6 100644 --- a/Surf/AnalyzeTableViewController.swift +++ b/Surf/AnalyzeTableViewController.swift @@ -8,7 +8,7 @@ import UIKit import NetworkExtension -import SwiftyJSON + import SFSocket import CoreTelephony import Fabric diff --git a/Surf/LogListTableViewController.swift b/Surf/LogListTableViewController.swift index 10e21d3..292965f 100644 --- a/Surf/LogListTableViewController.swift +++ b/Surf/LogListTableViewController.swift @@ -8,7 +8,7 @@ import UIKit import SFSocket -import SwiftyJSON + import XRuler struct SFFILE { var name:String diff --git a/Surf/RecentReqViewController.swift b/Surf/RecentReqViewController.swift index ae1b8d1..735ba0b 100644 --- a/Surf/RecentReqViewController.swift +++ b/Surf/RecentReqViewController.swift @@ -8,7 +8,7 @@ import UIKit import NetworkExtension -import SwiftyJSON + import SFSocket import XRuler import Xcon diff --git a/Surf/RequestDetailViewController.swift b/Surf/RequestDetailViewController.swift index 6bfd871..29931c3 100644 --- a/Surf/RequestDetailViewController.swift +++ b/Surf/RequestDetailViewController.swift @@ -7,7 +7,7 @@ // import UIKit -import SwiftyJSON + import SFSocket import XRuler import Xcon diff --git a/Surf/RuleResultsViewController.swift b/Surf/RuleResultsViewController.swift index 3a9346c..cf9a710 100644 --- a/Surf/RuleResultsViewController.swift +++ b/Surf/RuleResultsViewController.swift @@ -8,7 +8,7 @@ import UIKit import NetworkExtension -import SwiftyJSON + import SFSocket class RuleResultsViewController: SFTableViewController { diff --git a/Surf/SFCountry.swift b/Surf/SFCountry.swift index 778d9c6..7836ec5 100644 --- a/Surf/SFCountry.swift +++ b/Surf/SFCountry.swift @@ -7,7 +7,7 @@ // import Foundation -import SwiftyJSON + import MMDB import AxLogger class CData { diff --git a/SurfToday/TodayViewController.swift b/SurfToday/TodayViewController.swift index da070f2..31684f8 100644 --- a/SurfToday/TodayViewController.swift +++ b/SurfToday/TodayViewController.swift @@ -9,7 +9,7 @@ import UIKit import NotificationCenter import NetworkExtension -import SwiftyJSON + import DarwinCore import SFSocket import Crashlytics diff --git a/XDataService/RequestsBasic.swift b/XDataService/RequestsBasic.swift index b2fb153..7079baf 100644 --- a/XDataService/RequestsBasic.swift +++ b/XDataService/RequestsBasic.swift @@ -7,7 +7,7 @@ // import Cocoa -import SwiftyJSON + import NetworkExtension import SFSocket import XProxy @@ -32,58 +32,58 @@ open class RequestsBasic: NSViewController,NSTableViewDelegate,NSTableViewDataSo public func processData(data:Data) { let oldresults = results results.removeAll() - - let obj = try! JSON.init(data: data) - if obj.error == nil { - - let count = obj["count"] - - if count.intValue != 0 { - - let result = obj["data"] - if result.type == .array { - for item in result { - - let json = item.1 - let r = SFRequestInfo.init(rID: 0) - r.map(json) - let rr = oldresults.filter({ info -> Bool in - if info.reqID == r.reqID && info.subID == r.subID { - return true - } - return false - }) - - if rr.isEmpty { - results.append(r) - r.speedtraffice = r.traffice - }else { - let old = rr.first! - if r.traffice.rx > old.traffice.rx { - //sub id reset - r.speedtraffice.rx = r.traffice.rx - old.traffice.rx - } - - if r.traffice.tx > old.traffice.tx{ - //? - r.speedtraffice.tx = r.traffice.tx - old.traffice.tx - } - - - results.append(r) - } - - } - } - if results.count > 0 { - results.sort(by: { $0.reqID < $1.reqID }) - - } - - } - - - } + //FIXME: +// let obj = try! JSON.init(data: data) +// if obj.error == nil { +// +// let count = obj["count"] +// +// if count.intValue != 0 { +// +// let result = obj["data"] +// if result.type == .array { +// for item in result { +// +// let json = item.1 +// let r = SFRequestInfo.init(rID: 0) +// r.map(json) +// let rr = oldresults.filter({ info -> Bool in +// if info.reqID == r.reqID && info.subID == r.subID { +// return true +// } +// return false +// }) +// +// if rr.isEmpty { +// results.append(r) +// r.speedtraffice = r.traffice +// }else { +// let old = rr.first! +// if r.traffice.rx > old.traffice.rx { +// //sub id reset +// r.speedtraffice.rx = r.traffice.rx - old.traffice.rx +// } +// +// if r.traffice.tx > old.traffice.tx{ +// //? +// r.speedtraffice.tx = r.traffice.tx - old.traffice.tx +// } +// +// +// results.append(r) +// } +// +// } +// } +// if results.count > 0 { +// results.sort(by: { $0.reqID < $1.reqID }) +// +// } +// +// } +// +// +// } tableView.reloadData() From cc14cf5cf3381677443c5535350fa603f6c2b1ec Mon Sep 17 00:00:00 2001 From: networkextension Date: Sat, 17 Feb 2018 01:44:39 +0800 Subject: [PATCH 4/4] update to Codable --- Kwazii/RequestsVC.swift | 2 +- PacketTunnel/ENV.swift | 14 ++++- Surf-Mac/AdvancedWindowController.swift | 8 ++- Surf-Mac/AppDelegate.swift | 2 +- Surf-Mac/StatusView.swift | 65 ++++++++------------ Surf-Mac/Surf-Mac.entitlements | 4 +- Surf-Today/RequestsWindowController.swift | 72 +++++++++-------------- Surf.xcodeproj/project.pbxproj | 6 +- Surf/SFCountry.swift | 46 +++++++++------ 9 files changed, 108 insertions(+), 111 deletions(-) diff --git a/Kwazii/RequestsVC.swift b/Kwazii/RequestsVC.swift index 18a0842..bec0a00 100644 --- a/Kwazii/RequestsVC.swift +++ b/Kwazii/RequestsVC.swift @@ -14,7 +14,7 @@ import XRuler import XProxy final class RequestsVC: RequestsBasic { @IBOutlet weak var detail:NSView! - let report:SFVPNStatistics = SFVPNStatistics.shared + var refreshTime = DispatchSource.makeTimerSource(flags: DispatchSource.TimerFlags(rawValue: 0), queue: DispatchQueue.main) func startProxy(){ SKit.startGCDProxy(port: 10081, dispatchQueue: DispatchQueue.init(label: "Kwazii.dispatch"), socketQueue: DispatchQueue.init(label: "Kwazii.dispatch.socket")) diff --git a/PacketTunnel/ENV.swift b/PacketTunnel/ENV.swift index d824cb0..f100e1a 100644 --- a/PacketTunnel/ENV.swift +++ b/PacketTunnel/ENV.swift @@ -50,6 +50,16 @@ func prepareApp() { XProxy.debugEanble = true XRuler.kProxyGroupFile = ".ProxyGroup" - XRuler.groupIdentifier = "group.com.yarshure.Surf" - SKit.groupIdentifier = "group.com.yarshure.Surf" + #if os(iOS) + + + XRuler.groupIdentifier = "group.com.yarshure.Surf" + SKit.groupIdentifier = "group.com.yarshure.Surf" + NSLog("init ################333") + #elseif os(macOS) + XRuler.groupIdentifier = "745WQDK4L7.com.yarshure.Surf" + SKit.groupIdentifier = "745WQDK4L7.com.yarshure.Surf" + + #endif + } diff --git a/Surf-Mac/AdvancedWindowController.swift b/Surf-Mac/AdvancedWindowController.swift index 39cbbd3..1731d40 100644 --- a/Surf-Mac/AdvancedWindowController.swift +++ b/Surf-Mac/AdvancedWindowController.swift @@ -69,8 +69,12 @@ class AdvancedWindowController: NSWindowController { }else { ProxyGroupSettings.share.saveiCloudSync(false) } - - try! ProxyGroupSettings.share.save() + do { + try ProxyGroupSettings.share.save() + }catch let e { + alertMesage(e.localizedDescription) + } + window?.performClose(nil) } diff --git a/Surf-Mac/AppDelegate.swift b/Surf-Mac/AppDelegate.swift index 6c2e045..097442d 100644 --- a/Surf-Mac/AppDelegate.swift +++ b/Surf-Mac/AppDelegate.swift @@ -618,7 +618,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate,NSMenuDelegate ,NSTouchBar func applicationDidFinishLaunching(_ notification: Notification) { Fabric.with([Crashlytics.self]) - XRuler.groupIdentifier = "745WQDK4L7.com.yarshure.Surf" + prepareApp() UserDefaults.standard.set(true, forKey: "NSApplicationCrashOnExceptions") copyConfig() // testTouchBar() diff --git a/Surf-Mac/StatusView.swift b/Surf-Mac/StatusView.swift index e25a3ec..96a2e1b 100644 --- a/Surf-Mac/StatusView.swift +++ b/Surf-Mac/StatusView.swift @@ -12,7 +12,7 @@ import XRuler import NetworkExtension class StatusView: NSView { - var report:SFVPNStatistics = SFVPNStatistics.shared + var reportTimer:Timer? @IBOutlet weak var iconView: NSImageView! @IBOutlet weak var upView: NSTextField! @@ -53,24 +53,24 @@ class StatusView: NSView { let now = getInterfaceTraffic() if now.TunSent != 0 && now.TunReceived != 0 { //report.lastTraffice.tx = now.TunSent - - - if now.TunSent > report.totalTraffice.tx { - report.lastTraffice.tx = now.TunSent - report.totalTraffice.tx - - report.lastTraffice.rx = now.TunReceived - report.totalTraffice.rx - report.updateMax() - } - - - - report.totalTraffice.tx = now.TunSent - report.totalTraffice.rx = now.TunReceived - - let t = report.lastTraffice - - - upTrafficeView.stringValue = self.toString(x: t.tx,label: "",speed: true) - downTrafficView.stringValue = self.toString(x: t.rx,label: "",speed: true) + //FIXME: +// if now.TunSent > report.totalTraffice.tx { +// report.lastTraffice.tx = now.TunSent - report.totalTraffice.tx +// +// report.lastTraffice.rx = now.TunReceived - report.totalTraffice.rx +// report.updateMax() +// } +// +// +// +// report.totalTraffice.tx = now.TunSent +// report.totalTraffice.rx = now.TunReceived +// +// let t = report.lastTraffice +// +// +// upTrafficeView.stringValue = self.toString(x: t.tx,label: "",speed: true) +// downTrafficView.stringValue = self.toString(x: t.rx,label: "",speed: true) }else { upTrafficeView.stringValue = "0 B/s" downTrafficView.stringValue = "0 B/s" @@ -129,36 +129,23 @@ class StatusView: NSView { } func processData(data:Data) { - - //results.removeAll() - //print("111") - //let responseString = NSString(data: data!, encoding: NSUTF8StringEncoding) - let obj = try! JSON.init(data: data) - if obj.error == nil { - - //alertMessageAction("message dont init",complete: nil) - report.map(j: obj) - - - - + do { + let report:SFStatistics = try JSONDecoder().decode(SFStatistics.self, from: data) //bug here if let m = SFVPNManager.shared.manager, m.connection.status == .connected{ //chartsView.updateFlow(report.netflow) //chartsView.isHidden = false - if let last = report.netflow.totalFlows.last { + if let last = report.netflow.total.last { upTrafficeView.stringValue = self.toString(x: last.tx,label: "",speed: true) downTrafficView.stringValue = self.toString(x: last.rx,label: "",speed: true) } - - }else { } - //print(report.netflow.currentFlows) - - - + }catch let e { + print(e.localizedDescription) } + + } } diff --git a/Surf-Mac/Surf-Mac.entitlements b/Surf-Mac/Surf-Mac.entitlements index d2d4dbb..396762e 100644 --- a/Surf-Mac/Surf-Mac.entitlements +++ b/Surf-Mac/Surf-Mac.entitlements @@ -25,13 +25,13 @@ 745WQDK4L7 com.apple.developer.ubiquity-container-identifiers - iCloud.com.abigt.Surf + iCloud.com.yarshure.Surf com.apple.security.app-sandbox com.apple.security.application-groups - 745WQDK4L7.com.abigt.Surf + 745WQDK4L7.com.yarshure.Surf com.apple.security.network.client diff --git a/Surf-Today/RequestsWindowController.swift b/Surf-Today/RequestsWindowController.swift index fbd4062..6e2ca70 100644 --- a/Surf-Today/RequestsWindowController.swift +++ b/Surf-Today/RequestsWindowController.swift @@ -61,58 +61,42 @@ class RequestsWindowController: NSWindowController,NSTableViewDelegate,NSTableVi let oldresults = results results.removeAll() - let obj = try! JSON.init(data: data) - if obj.error == nil { + let helper = try! JSONDecoder().decode(ConnectionHelper.self, from: data) + + for item in helper.data { - let count = obj["count"] - if count.intValue != 0 { - - let result = obj["data"] - if result.type == .array { - for item in result { - - let json = item.1 - let r = SFRequestInfo.init(rID: 0) - r.map(json) - let rr = oldresults.filter({ info -> Bool in - if info.reqID == r.reqID && info.subID == r.subID { - return true - } - return false - }) - - if rr.isEmpty { - results.append(r) - r.speedtraffice = r.traffice - }else { - let old = rr.first! - if r.traffice.rx > old.traffice.rx { - //sub id reset - r.speedtraffice.rx = r.traffice.rx - old.traffice.rx - } - - if r.traffice.tx > old.traffice.tx{ - //? - r.speedtraffice.tx = r.traffice.tx - old.traffice.tx - } - - - results.append(r) - } - - } + let rr = oldresults.filter({ info -> Bool in + if info.reqID == item.reqID && info.subID == item.subID { + return true } - if results.count > 0 { - results.sort(by: { $0.reqID < $1.reqID }) - + return false + }) + + if rr.isEmpty { + results.append(item) + item.speedtraffice = item.traffice + }else { + let old = rr.first! + if item.traffice.rx > old.traffice.rx { + //sub id reset + item.speedtraffice.rx = item.traffice.rx - old.traffice.rx } + if item.traffice.tx > old.traffice.tx{ + //? + item.speedtraffice.tx = item.traffice.tx - old.traffice.tx + } + + + results.append(item) } - } - + if results.count > 0 { + results.sort(by: { $0.reqID < $1.reqID }) + + } tableView.reloadData() } diff --git a/Surf.xcodeproj/project.pbxproj b/Surf.xcodeproj/project.pbxproj index bfa94b7..24c4df7 100644 --- a/Surf.xcodeproj/project.pbxproj +++ b/Surf.xcodeproj/project.pbxproj @@ -274,6 +274,7 @@ 69A99E4C1C6A2E96009EC4C5 /* SFLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69A99E4B1C6A2E96009EC4C5 /* SFLog.swift */; }; 69A99E4D1C6A2E96009EC4C5 /* SFLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69A99E4B1C6A2E96009EC4C5 /* SFLog.swift */; }; 69A9FE4D1CC5C0CF00D5DB41 /* ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 69A9FE4B1CC5C0CF00D5DB41 /* ionicons.ttf */; }; + 69ABFDD32037485B006A355E /* ENV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69BE2E681FFC704C0078845A /* ENV.swift */; }; 69AD9CC8200354A100C01011 /* XFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69AD9CC7200354A100C01011 /* XFoundation.framework */; }; 69AD9CC9200354B400C01011 /* XFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69AD9CC7200354A100C01011 /* XFoundation.framework */; }; 69AD9CCA200354B400C01011 /* XFoundation.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 69AD9CC7200354A100C01011 /* XFoundation.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -1902,7 +1903,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "./maclab/Fabric.framework/run key token"; + shellScript = "./maclab/Fabric.framework/run c9fadabbd94966964cc83af7873deadbe56ceb89 e746b1825d577768a63f93d7b2ddd5177ab095a1a9152a29666458e8e5d514f1\n"; }; 69C2A60B1F147D9000B1B0A6 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2068,6 +2069,7 @@ 69BF6C6E1DE6D742000ABF09 /* RequestsWindowController.swift in Sources */, 696573D21DE48EBF00D95D59 /* AdvancedWindowController.swift in Sources */, 6906B90E1DE29F8300A60B66 /* ConfigWindowController.swift in Sources */, + 69ABFDD32037485B006A355E /* ENV.swift in Sources */, 6906B9441DE5412B00A60B66 /* SFCountry.swift in Sources */, 6952BAEA1DF92F9D00DAD397 /* QrWindowController.swift in Sources */, 6952BAF11DF9529700DAD397 /* QrController.swift in Sources */, @@ -2805,7 +2807,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = com.yarshure.Surf.mac; PRODUCT_NAME = A.BIG.T; - PROVISIONING_PROFILE = "6fd5297f-b0c7-44a5-89df-078d148c8357"; + PROVISIONING_PROFILE = "ed982b7d-88e2-4c18-8d1e-c01597aa9750"; PROVISIONING_PROFILE_SPECIFIER = mac6; SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = "Surf-Mac/$(SWIFT_MODULE_NAME)-Bridging-Header.h"; diff --git a/Surf/SFCountry.swift b/Surf/SFCountry.swift index 7836ec5..1da3c37 100644 --- a/Surf/SFCountry.swift +++ b/Surf/SFCountry.swift @@ -19,32 +19,42 @@ class CData { } } +//"code": "AD", +//"emoji": "🇦🇩", +//"unicode": "U+1F1E6 U+1F1E9", +//"name": "Andorra", +//"title": "flag for Andorra" + +struct CountryCode:Codable { + var code:String = "" + var emoji:String = "" + var unicode:String = "" + var name:String = "" + var title:String = "" +} +struct CountryCodeList:Codable { + var list:[CountryCode] = [] +} class Country { var db:MMDB? //var data:JSON? - var list:[String:CData] = [:] + var list:[String:CountryCode] = [:] static let setting:Country = { let c = Country() if let path = Bundle.main.path(forResource:"data.json", ofType: nil) { - let d = try! Data.init(contentsOf: URL.init(fileURLWithPath: path)) - let data = try! JSON(data: d) - if data.error == nil { - for (k,v) in data { - let code = v["code"].stringValue - let e = v["emoji"].stringValue - let x = CData.init(c: code, e: e) - c.list[code] = x - //print("\(code),\(e)") - } - }else { - //fatalError() - if let error = data.error { - print("\(error)") + do { + let d = try Data.init(contentsOf: URL.init(fileURLWithPath: path)) + let list = try JSONDecoder().decode(CountryCodeList.self, from: d) + for i in list.list { + + c.list[i.code] = i + } - + }catch let e { + print(e) } - - + + }else { fatalError()