Skip to content

feat: VPN protocol #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2024
+3,085 −2
Merged

feat: VPN protocol #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 168 additions & 0 deletions Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */; };
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */; };
AAD720D02D0816B200F6304D /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = AAD720CF2D0816B200F6304D /* Alamofire */; };
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */ = {isa = PBXBuildFile; productRef = 961679522CFF207900B2B6DF /* SwiftProtobuf */; };
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -37,6 +39,13 @@
remoteGlobalIDString = 9616792F2CFF117300B2B6DF;
remoteInfo = VPN;
};
961679DD2D030E1D00B2B6DF /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 961678F42CFF100D00B2B6DF /* Project object */;
proxyType = 1;
remoteGlobalIDString = 961678FB2CFF100D00B2B6DF;
remoteInfo = "Coder Desktop";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -59,6 +68,7 @@
961679192CFF100E00B2B6DF /* Coder DesktopUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Coder DesktopUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */ = {isa = PBXFileReference; explicitFileType = "wrapper.system-extension"; includeInIndex = 0; path = "com.coder.Coder-Desktop.VPN.systemextension"; sourceTree = BUILT_PRODUCTS_DIR; };
961679322CFF117300B2B6DF /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
961679D92D030E1D00B2B6DF /* ProtoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ProtoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
Expand All @@ -69,6 +79,13 @@
);
target = 9616792F2CFF117300B2B6DF /* VPN */;
};
961679472CFF14EA00B2B6DF /* Exceptions for "Proto" folder in "VPN" target */ = {
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
membershipExceptions = (
Sender.swift,
);
target = 9616792F2CFF117300B2B6DF /* VPN */;
};
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
Expand All @@ -95,6 +112,19 @@
path = VPN;
sourceTree = "<group>";
};
961679432CFF149000B2B6DF /* Proto */ = {
isa = PBXFileSystemSynchronizedRootGroup;
exceptions = (
961679472CFF14EA00B2B6DF /* Exceptions for "Proto" folder in "VPN" target */,
);
path = Proto;
sourceTree = "<group>";
};
961679DA2D030E1D00B2B6DF /* ProtoTests */ = {
isa = PBXFileSystemSynchronizedRootGroup;
path = ProtoTests;
sourceTree = "<group>";
};
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -105,6 +135,8 @@
AAD720D02D0816B200F6304D /* Alamofire in Frameworks */,
AA8BC4CF2D00A4B700E1ABAA /* KeychainAccess in Frameworks */,
AA8BC33F2D0061F200E1ABAA /* FluidMenuBarExtra in Frameworks */,
961679552CFF207900B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */,
961679532CFF207900B2B6DF /* SwiftProtobuf in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -127,7 +159,16 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
961679E52D03144C00B2B6DF /* SwiftProtobufPluginLibrary in Frameworks */,
961679332CFF117300B2B6DF /* NetworkExtension.framework in Frameworks */,
961679E32D03144900B2B6DF /* SwiftProtobuf in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
961679D62D030E1D00B2B6DF /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -137,6 +178,8 @@
961678F32CFF100D00B2B6DF = {
isa = PBXGroup;
children = (
961679432CFF149000B2B6DF /* Proto */,
961679DA2D030E1D00B2B6DF /* ProtoTests */,
961678FE2CFF100D00B2B6DF /* Coder Desktop */,
961679122CFF100E00B2B6DF /* Coder DesktopTests */,
9616791C2CFF100E00B2B6DF /* Coder DesktopUITests */,
Expand All @@ -153,6 +196,7 @@
9616790F2CFF100E00B2B6DF /* Coder DesktopTests.xctest */,
961679192CFF100E00B2B6DF /* Coder DesktopUITests.xctest */,
961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */,
961679D92D030E1D00B2B6DF /* ProtoTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -185,12 +229,15 @@
);
fileSystemSynchronizedGroups = (
961678FE2CFF100D00B2B6DF /* Coder Desktop */,
961679432CFF149000B2B6DF /* Proto */,
);
name = "Coder Desktop";
packageProductDependencies = (
AA8BC33E2D0061F200E1ABAA /* FluidMenuBarExtra */,
AA8BC4CE2D00A4B700E1ABAA /* KeychainAccess */,
AAD720CF2D0816B200F6304D /* Alamofire */,
961679522CFF207900B2B6DF /* SwiftProtobuf */,
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */,
);
productName = "Coder Desktop";
productReference = 961678FC2CFF100D00B2B6DF /* Coder Desktop.app */;
Expand Down Expand Up @@ -260,11 +307,36 @@
);
name = VPN;
packageProductDependencies = (
961679E22D03144900B2B6DF /* SwiftProtobuf */,
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */,
);
productName = VPN;
productReference = 961679302CFF117300B2B6DF /* com.coder.Coder-Desktop.VPN.systemextension */;
productType = "com.apple.product-type.system-extension";
};
961679D82D030E1D00B2B6DF /* ProtoTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 961679DF2D030E1D00B2B6DF /* Build configuration list for PBXNativeTarget "ProtoTests" */;
buildPhases = (
961679D52D030E1D00B2B6DF /* Sources */,
961679D62D030E1D00B2B6DF /* Frameworks */,
961679D72D030E1D00B2B6DF /* Resources */,
);
buildRules = (
);
dependencies = (
961679DE2D030E1D00B2B6DF /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
961679DA2D030E1D00B2B6DF /* ProtoTests */,
);
name = ProtoTests;
packageProductDependencies = (
);
productName = ProtoTests;
productReference = 961679D92D030E1D00B2B6DF /* ProtoTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -289,6 +361,10 @@
9616792F2CFF117300B2B6DF = {
CreatedOnToolsVersion = 16.1;
};
961679D82D030E1D00B2B6DF = {
CreatedOnToolsVersion = 16.1;
TestTargetID = 961678FB2CFF100D00B2B6DF;
};
};
};
buildConfigurationList = 961678F72CFF100D00B2B6DF /* Build configuration list for PBXProject "Coder Desktop" */;
Expand All @@ -306,6 +382,7 @@
AA8BC33D2D0061F200E1ABAA /* XCRemoteSwiftPackageReference "fluid-menu-bar-extra" */,
AA8BC4CD2D00A4B700E1ABAA /* XCRemoteSwiftPackageReference "KeychainAccess" */,
AAD720CE2D0816B200F6304D /* XCRemoteSwiftPackageReference "Alamofire" */,
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 961678FD2CFF100D00B2B6DF /* Products */;
Expand All @@ -316,6 +393,7 @@
9616790E2CFF100E00B2B6DF /* Coder DesktopTests */,
961679182CFF100E00B2B6DF /* Coder DesktopUITests */,
9616792F2CFF117300B2B6DF /* VPN */,
961679D82D030E1D00B2B6DF /* ProtoTests */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -349,6 +427,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
961679D72D030E1D00B2B6DF /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -380,6 +465,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
961679D52D030E1D00B2B6DF /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -402,6 +494,11 @@
isa = PBXTargetDependency;
productRef = AA8BC33B2D0060E700E1ABAA /* SwiftLintBuildToolPlugin */;
};
961679DE2D030E1D00B2B6DF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 961678FB2CFF100D00B2B6DF /* Coder Desktop */;
targetProxy = 961679DD2D030E1D00B2B6DF /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -701,6 +798,40 @@
};
name = Release;
};
961679E02D030E1D00B2B6DF /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4399GN35BJ;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
};
name = Debug;
};
961679E12D030E1D00B2B6DF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 4399GN35BJ;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -749,6 +880,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
961679DF2D030E1D00B2B6DF /* Build configuration list for PBXNativeTarget "ProtoTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
961679E02D030E1D00B2B6DF /* Debug */,
961679E12D030E1D00B2B6DF /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
Expand Down Expand Up @@ -792,6 +932,14 @@
minimumVersion = 5.10.2;
};
};
961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-protobuf.git";
requirement = {
kind = exactVersion;
version = 1.28.2;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
Expand Down Expand Up @@ -820,6 +968,26 @@
package = AAD720CE2D0816B200F6304D /* XCRemoteSwiftPackageReference "Alamofire" */;
productName = Alamofire;
};
961679522CFF207900B2B6DF /* SwiftProtobuf */ = {
isa = XCSwiftPackageProductDependency;
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
productName = SwiftProtobuf;
};
961679542CFF207900B2B6DF /* SwiftProtobufPluginLibrary */ = {
isa = XCSwiftPackageProductDependency;
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
productName = SwiftProtobufPluginLibrary;
};
961679E22D03144900B2B6DF /* SwiftProtobuf */ = {
isa = XCSwiftPackageProductDependency;
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
productName = SwiftProtobuf;
};
961679E42D03144C00B2B6DF /* SwiftProtobufPluginLibrary */ = {
isa = XCSwiftPackageProductDependency;
package = 961679512CFF207900B2B6DF /* XCRemoteSwiftPackageReference "swift-protobuf" */;
productName = SwiftProtobufPluginLibrary;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 961678F42CFF100D00B2B6DF /* Project object */;
Expand Down
13 changes: 11 additions & 2 deletions ...Desktop/Coder Desktop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
"revision" : "e0c7eebc5a4465a3c4680764f26b7a61f567cdaf"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "ebc7251dd5b37f627c93698e4374084d98409633",
"version" : "1.28.2"
}
},
{
"identity" : "swiftlintplugins",
"kind" : "remoteSourceControl",
Expand All @@ -41,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nalexn/ViewInspector",
"state" : {
"revision" : "5acfa0a3c095ac9ad050abe51c60d1831e8321da",
"version" : "0.10.0"
"revision" : "788e7879d38a839c4e348ab0762dcc0364e646a2",
"version" : "0.10.1"
}
}
],
Expand Down
11 changes: 11 additions & 0 deletions Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/Coder Desktop.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@
ReferencedContainer = "container:Coder Desktop.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "961679D82D030E1D00B2B6DF"
BuildableName = "ProtoTests.xctest"
BlueprintName = "ProtoTests"
ReferencedContainer = "container:Coder Desktop.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
Loading