diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/homeval.iml b/.idea/homeval.iml
new file mode 100644
index 0000000..d24fb44
--- /dev/null
+++ b/.idea/homeval.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..723db29
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 1b6a0a5..d014f4a 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
- 
+ 
Homeval is a custom server implementation of goval, replits evaluation protocol.
-# ⚠️ Stability
-**⚠️ Homeval is still in early alpha and can be unstable so do not trust it with data you have not backed up. ⚠️**
+> [!CAUTION]
+> **⚠️ Homeval is still in early alpha and can be unstable so do not trust it with data you have not backed up. ⚠️**
# License
Homeval is licensed under GNU AGPL-3.0-only
@@ -18,41 +18,46 @@ Homeval is licensed under GNU AGPL-3.0-only
Unfortunately due to replit's TOS, AGPL programs cannot be run in public repls. Though, private repls are fine, as long as you still fulfill the terms of the license.
This is due to all public repls being licensed under MIT, and GPL code cannot be included in a MIT licensed project.
-# Running homeval
+# Building homeval
-## Installation
1. Git clone the repository
2. Install required dependencies
- * If on macOS or linux: [Bun](https://bun.sh/) and [Git](https://git-scm.com/downloads)
- * If on windows: [Node.js](https://nodejs.org/en/download), [Yarn v1](https://classic.yarnpkg.com/lang/en/docs/install/#windows-stable) and [Git for Windows](https://gitforwindows.org/)
- * The [Protobuf Compiler](https://github.com/protocolbuffers/protobuf/releases)
- * If using a debian linux based distro just run: `sudo apt install protobuf-compiler`
- * [Rustup](https://rustup.rs/)
- * And finally, [Ripgrep](https://github.com/BurntSushi/ripgrep#installation).
+ * [Git](https://git-scm.com/downloads) ( [Git for Windows](https://gitforwindows.org/) on windows)
+ * The [Protobuf Compiler](https://github.com/protocolbuffers/protobuf/releases)
+ * If using a debian linux based distro just run: `sudo apt install protobuf-compiler`
+ * [Rustup](https://rustup.rs/)
+
+# Running homeval
+
+## Required tools
+
+- [Git](https://git-scm.com/downloads) ( [Git for Windows](https://gitforwindows.org/) on windows)
+- [Ripgrep](https://github.com/BurntSushi/ripgrep#installation).
+
## Setup
### Database
-Setup a [PostgreSQL](https://www.postgresql.org/) database and set the env var `$HOMEVAL_DB` to it's connection url.
+Set up a [PostgreSQL](https://www.postgresql.org/) database and set the env var `$HOMEVAL_DB` to its connection url.
If the database isn't setup repldb won't work, and file history won't persist through server restarts.
### Proper Authentication
-> ⚠️ If you use someone elses key server it could let them authenticate as any user on your homeval instance
+> [!WARNING]
+> ⚠If you use someone else's key server it could let them authenticate as any user on your homeval instance
Run [repl-key-server](https://github.com/Goval-Community/repl-key-server) on a repl and set the env var `$HOMEVAL_PASETO_KEY_URL` to `/keys`.
### Replspace api
-> ⚠️ Likely won't work on windows
+> [!IMPORTANT]
+> This will not work on windows.
To make use of this feature make sure that all files in `extras/` are placed in a directory contained in your `$PATH` on the machine running homeval.
## ⚠️ Notice for windows users
On windows `cargo run` as well as invoking the built binary must happen inside the [Git Bash](https://gitforwindows.org/) shell.
-Console and shell will not work, this will be fixed later. You should submit a bug report for other broken features.
-
## Building
Homeval can be built into a binary with `cargo build --release` the binary will then end up in `target/release/homeval` (make sure to set `RUST_LOG=INFO` when running this binary or you won't get any logs).
@@ -83,7 +88,7 @@ Make a new file in `services/` name it with the format `.js` then
| --- | --- | --- | --- | --- |
| Linux[^linux] | ✅ | ✅ | ✅ | ✅[^linux-tests] |
| macOS[^macos] | ✅ | ✅ | ✅ | ❎ |
-| Windows | ✅ | ✅ | ❎[^windows] | ❎ |
+| Windows | ✅ | ✅ | ✅ | ❎ |
[^testing]: This marks if every release is officially tested for this target.
@@ -94,10 +99,8 @@ Make a new file in `services/` name it with the format `.js` then
[^linux-tests]: Currently, the only tested distribution is arch linux. Though all distros with an up to date GLIC *should* work.
-[^windows]: Shell and Console support are currently unavailable on windows.
-
# TODO:
-- [ ] Have windows builds feature complete
- [ ] Debugger support
-- [ ] Audio channel support
\ No newline at end of file
+- [ ] Pid2 Support
+- [ ] Unit Tests
\ No newline at end of file
diff --git a/protobuf/src/goval.proto b/protobuf/src/goval.proto
index 4bf37ce..98c7192 100644
--- a/protobuf/src/goval.proto
+++ b/protobuf/src/goval.proto
@@ -1,4 +1,4 @@
-// @replit/protocol 0.3.31
+// @replit/protocol 0.3.55
syntax = "proto3";
package goval;
@@ -13,6 +13,7 @@ message Command {
int32 session = 2;
string ref = 1000;
map traceInfo = 1001;
+ bool forceTrace = 1002;
oneof body {
OpenChannel openChan = 3;
OpenChannelRes openChanRes = 4;
@@ -24,7 +25,6 @@ message Command {
Toast toast = 11;
ProtocolError protocolError = 45;
Redirect redirect = 12;
- AlwaysOn alwaysOn = 13;
RunMain runMain = 16;
Clear clear = 17;
string eval = 20;
@@ -39,6 +39,7 @@ message Command {
OutputBlockEndEvent outputBlockEndEvent = 444;
sint32 exitCodeEvent = 445;
bool splitStderrRequest = 446;
+ ShellMetadata shellMetadata = 447;
SaneTerm saneTerm = 26;
ResizeTerm resizeTerm = 27;
State state = 28;
@@ -51,6 +52,7 @@ message Command {
File tryRemove = 36;
File mkdir = 39;
File stat = 368;
+ File resetNixFilesystem = 449;
StatResult statRes = 369;
TransferStart transferStart = 320;
TransferChunk transferChunk = 321;
@@ -119,6 +121,7 @@ message Command {
PackageInfo packageInfo = 282;
PackageInfoResp packageInfoResp = 283;
PackageAdd packageAdd = 284;
+ PackageAddResponse packageAddResponse = 448;
PackageRemove packageRemove = 285;
PackageInstall packageInstall = 286;
PackageInstallResponse packageInstallResponse = 290;
@@ -181,6 +184,8 @@ message Command {
NixChannelLatestStableResponse nixChannelLatestStableResponse = 419;
NixPackageSearchRequest nixPackageSearchRequest = 420;
NixPackageSearchResponse nixPackageSearchResponse = 421;
+ NixPackageInfoRequest nixPackageInfoRequest = 450;
+ NixPackageInfoResponse nixPackageInfoResponse = 451;
UserEvent userEvent = 423;
ReplspaceApiOpenFile replspaceApiOpenFile = 424;
ReplspaceApiCloseFile replspaceApiCloseFile = 425;
@@ -199,6 +204,13 @@ message Command {
ReplspaceApiOpenMultipleFiles replspaceApiOpenMultipleFiles = 438;
NixModulesGetRegistryRequest nixModulesGetRegistryRequest = 439;
NixModulesGetRegistryResponse nixModulesGetRegistryResponse = 440;
+ ReplspaceApiShellTracker replspaceApiShellTracker = 442;
+ NixModuleConfigGetRequest nixModuleConfigGetRequest = 460;
+ NixModuleConfigGetResponse nixModuleConfigGetResponse = 461;
+ NixModuleConfigSetRequest nixModuleConfigSetRequest = 462;
+ NixModuleConfigSetResponse nixModuleConfigSetResponse = 463;
+ ReplspaceApiSSHTokenGetRequest replspaceApiSSHTokenGetRequest = 464;
+ ReplspaceApiSSHTokenGetResponse replspaceApiSSHTokenGetResponse = 465;
}
}
@@ -231,10 +243,19 @@ message NixChannelLatestStableRequest {}
message NixChannelLatestStableResponse { string channel = 1; }
-message NixPackageSearchRequest { string query = 1; }
+message NixPackageSearchRequest {
+ string query = 1;
+ oneof _filterBuilt { bool filterBuilt = 2; }
+}
message NixPackageSearchResponse { repeated NixPackage packages = 1; }
+message NixPackageInfoRequest { string name = 1; }
+
+message NixPackageInfoResponse {
+ oneof _package { NixPackage package = 1; }
+}
+
message StartLSP {
string language = 1;
string languageServerId = 2;
@@ -339,8 +360,9 @@ message FileEvent {
message Flush {
enum Consistency {
- PermanentStorage = 0;
+ DiskAndHistory = 0;
Disk = 1;
+ History = 2;
}
Flush.Consistency consistency = 1;
@@ -556,8 +578,6 @@ message ProtocolError { string text = 1; }
message Redirect { string url = 1; }
-message AlwaysOn { bool enable = 1; }
-
message RunMain {
enum RunMode {
RUN = 0;
@@ -569,6 +589,8 @@ message RunMain {
string filePath = 3;
string runnerId = 4;
bool fromHosting = 5;
+ string runID = 6;
+ int32 clientSession = 7;
}
message OpenChannel {
@@ -634,7 +656,9 @@ message PortOpen {
uint32 externalPort = 4;
string comm = 5;
repeated string cmdline = 6;
+ string cgroup = 8;
uint32 pid = 7;
+ repeated uint32 pidChain = 9;
}
message PortClose {
@@ -755,7 +779,15 @@ message ReplspaceApiGitHubToken {
string token = 2;
}
-message ReplspaceApiOpenMultipleFiles { repeated string files = 1; }
+message ReplspaceApiOpenMultipleFiles {
+ repeated string files = 1;
+ repeated string urls = 2;
+}
+
+message ReplspaceApiShellTracker {
+ string cmd = 1;
+ string pwd = 2;
+}
message Focused {}
@@ -783,6 +815,7 @@ message Exec {
Exec.Lifecycle lifecycle = 6;
bool splitStderr = 4;
bool splitLogs = 5;
+ bool waitForEnv = 7;
}
message Package {
@@ -811,7 +844,12 @@ message PackageInfo { Package pkg = 1; }
message PackageInfoResp { Package pkg = 1; }
-message PackageAdd { repeated Package pkgs = 1; }
+message PackageAdd {
+ repeated Package pkgs = 1;
+ bool useNewResponse = 2;
+}
+
+message PackageAddResponse { bool installedSystemDependencies = 1; }
message PackageRemove { repeated Package pkgs = 1; }
@@ -827,6 +865,7 @@ message PackageInstallResponse {
int64 upmAddDurationMs = 3;
int64 upmLockDurationMs = 4;
int64 totalDurationMs = 5;
+ bool installedSystemDependencies = 6;
}
message PackageListSpecfile {}
@@ -998,6 +1037,9 @@ message DotReplit {
repeated string modules = 23;
ExtensionConfig extension = 24;
RulesConfig rules = 25;
+ SuggestionsConfig suggestions = 26;
+ ObjectStorageConfig objectStorage = 27;
+ AutoSaveConfig autoSave = 28;
}
message DotReplitEnvVar {
@@ -1008,6 +1050,7 @@ message DotReplitEnvVar {
message DotReplitPort {
uint32 localPort = 1;
uint32 externalPort = 2;
+ bool exposeLocalhost = 3;
}
message DotReplitHint {
@@ -1022,6 +1065,21 @@ message DeploymentConfig {
GCE = 0;
CLOUDRUN = 1;
STATIC = 2;
+ VM = 3;
+ AUTOSCALE = 4;
+ SCHEDULED = 5;
+ EXTENSION = 6;
+ }
+
+ message RewriteRule {
+ string from = 1;
+ string to = 2;
+ }
+
+ message Header {
+ string path = 1;
+ string name = 2;
+ string value = 3;
}
Exec run = 1;
@@ -1029,6 +1087,8 @@ message DeploymentConfig {
bool ignorePorts = 3;
DeploymentConfig.Target target = 4;
string publicDir = 5;
+ repeated DeploymentConfig.RewriteRule rewrites = 6;
+ repeated DeploymentConfig.Header responseHeaders = 7;
}
message ExtensionConfig {
@@ -1039,6 +1099,8 @@ message ExtensionConfig {
string staticDirectory = 5;
}
+message SuggestionsConfig { repeated string extensions = 1; }
+
message NixConfig { string channel = 1; }
message HostingConfig {
@@ -1161,7 +1223,12 @@ message NixModule {
repeated FormatterOption formatters = 13;
}
-message NixModulesChanged { repeated NixModule modules = 1; }
+message NixModulesChanged {
+ repeated NixModule modules = 1;
+ repeated NixModuleConfigValue moduleConfigValues = 2;
+ string buildOutput = 3;
+ repeated NixModuleConfigModuleEntry modulesV2 = 4;
+}
message NixModulesBuildRequest {}
@@ -1171,6 +1238,10 @@ message NixModulesGetRegistryResponse {
repeated NixModulesRegistryEntry modules = 1;
map autoUpgrade = 2;
map recommendUpgrade = 3;
+ repeated LanguageServerOption languageServers = 4;
+ repeated FormatterOption formatters = 5;
+ repeated PackagerOption packagers = 6;
+ repeated NixModulesV2RegistryEntry modulesV2 = 7;
}
message NixModulesRegistryEntry {
@@ -1182,6 +1253,7 @@ message NixModulesRegistryEntry {
repeated string tags = 6;
string commit = 7;
string path = 8;
+ string displayVersion = 9;
}
message NixModulesUpgradeMapEntry {
@@ -1189,6 +1261,92 @@ message NixModulesUpgradeMapEntry {
string changelog = 2;
}
+message NixModulesV2RegistryEntry {
+ string id = 1;
+ string name = 2;
+ string description = 3;
+ repeated NixModuleOption options = 4;
+}
+
+message NixModuleOption {
+ string name = 1;
+ string description = 2;
+ oneof type {
+ NixModuleBooleanType booleanType = 3;
+ NixModuleStringType stringType = 4;
+ NixModuleChoiceStringType choiceStringType = 5;
+ NixModuleStringListType stringListType = 6;
+ NixModuleIntegerType integerType = 7;
+ }
+}
+
+message NixModuleBooleanType { bool default = 1; }
+
+message NixModuleStringType { string default = 1; }
+
+message NixModuleIntegerType { int32 default = 1; }
+
+message NixModuleChoiceStringType {
+ string default = 1;
+ repeated string choices = 2;
+}
+
+message NixModuleStringListType { repeated string default = 1; }
+
+message NixModuleConfigGetRequest {}
+
+message NixModuleConfigGetResponse {
+ repeated NixModuleConfigValue values = 1;
+ repeated NixModuleConfigModuleEntry modules = 2;
+}
+
+message NixModuleConfigSetRequest {
+ repeated NixModuleConfigValue values = 1;
+ repeated NixModuleConfigModuleEntry modules = 2;
+}
+
+message NixModuleConfigSetResponse {
+ enum Status {
+ Ok = 0;
+ Error = 1;
+ }
+
+ NixModuleConfigSetResponse.Status status = 1;
+ string error = 2;
+}
+
+message NixModuleConfigModuleEntry {
+ string id = 1;
+ repeated NixModuleConfigValue values = 2;
+}
+
+message NixModuleConfigValue {
+ string moduleId = 1;
+ string optionName = 2;
+ oneof value {
+ string stringValue = 3;
+ int32 integerValue = 4;
+ bool booleanValue = 5;
+ StringList stringListValue = 7;
+ }
+}
+
+message ReplspaceApiSSHTokenGetRequest {
+ string nonce = 1;
+ string replid = 2;
+}
+
+message ReplspaceApiSSHTokenGetResponse {
+ string nonce = 1;
+ string token = 2;
+}
+
+message StringList { repeated string stringList = 1; }
+
+message ObjectStorageConfig { string defaultBucketID = 1; }
+
+message AutoSaveConfig { bool disabled = 1; }
+
message ToolchainGetRequest {}
message ToolchainConfigs {
@@ -1230,6 +1388,8 @@ message LanguageServerOption {
string language = 3;
FileTypeAttrs fileTypeAttrs = 4;
LanguageServerConfig config = 5;
+ string moduleId = 6;
+ string displayVersion = 7;
}
message FileTypeAttrs {
@@ -1246,6 +1406,8 @@ message PackagerOption {
bool enabledForHosting = 5;
bool packageSearch = 6;
bool guessImports = 7;
+ string moduleId = 8;
+ string displayVersion = 9;
}
message FormatterOption {
@@ -1253,6 +1415,8 @@ message FormatterOption {
string name = 2;
Exec startCommand = 3;
FileTypeAttrs fileTypeAttrs = 4;
+ string moduleId = 5;
+ string displayVersion = 6;
}
message ReplDomainDoubleDash {
@@ -1277,6 +1441,14 @@ message ReplDomainId {
string suffix = 2;
}
+message ReplDomainReplitDev {
+ string id = 1;
+ string version = 2;
+ string signature = 3;
+ string clusterName = 4;
+ string suffix = 5;
+}
+
message ReplDomain {
oneof kind {
string custom = 1;
@@ -1284,6 +1456,7 @@ message ReplDomain {
ReplDomainDoubleDash doubleDash = 3;
ReplDomainDots dots = 4;
ReplDomainSingleDomain singleDomain = 5;
+ ReplDomainReplitDev replitDev = 6;
}
}
@@ -1295,6 +1468,7 @@ message OutputBlockStartEvent {
OutputBlockStartEvent.ExecutionMode executionMode = 1;
google.protobuf.Timestamp measureStartTime = 2;
+ string cgroup = 3;
}
message OutputBlockEndEvent {
@@ -1302,6 +1476,8 @@ message OutputBlockEndEvent {
google.protobuf.Timestamp measureEndTime = 2;
}
+message ShellMetadata { string cgroup = 1; }
+
message RulesConfig { FormatterRules formatter = 1; }
message FormatterRules {
@@ -1317,48 +1493,6 @@ message FormatterConfigWithPattern {
string pattern = 2;
}
-message ReplToken {
- message ClassroomMetadata {
- string id = 1;
- string language = 2;
- }
-
- message ReplID {
- string id = 1;
- string sourceRepl = 2;
- }
-
- enum WireFormat {
- PROTOBUF = 0;
- JSON = 1;
- PID2 = 2;
- }
-
- message Presenced {
- uint32 bearerID = 1;
- string bearerName = 2;
- }
-
- google.protobuf.Timestamp iat = 1;
- google.protobuf.Timestamp exp = 2;
- string salt = 3;
- string cluster = 4;
- repl.Persistence persistence = 6;
- repl.ResourceLimits resourceLimits = 10;
- repl.ResourceLimits interactiveResourceLimits = 17;
- ReplToken.WireFormat format = 12;
- ReplToken.Presenced presenced = 13;
- repeated string flags = 14;
- repl.Permissions permissions = 15;
- repeated features.Feature features = 16;
- repl.BuildInfo buildInfo = 18;
- oneof metadata {
- repl.Repl repl = 7;
- ReplToken.ReplID id = 8;
- ReplToken.ClassroomMetadata classroom = 9;
- }
-}
-
message TLSCertificate {
string domain = 1;
bytes cert = 2;
@@ -1446,7 +1580,7 @@ message GovalToken {
google.protobuf.Timestamp exp = 2;
string replid = 3;
oneof Token {
- ReplToken replToken = 4;
+ token.ReplToken replToken = 4;
GovalReplIdentity replIdentity = 5;
}
}
@@ -1462,6 +1596,7 @@ message GovalReplIdentity {
repl.BuildInfo buildInfo = 8;
bool isTeam = 9;
repeated string roles = 10;
+ repl.Org org = 14;
oneof runtime {
ReplRuntimeInteractive interactive = 11;
ReplRuntimeHosting hosting = 13;
@@ -1481,6 +1616,51 @@ message ReplRuntimeHosting {
message ReplRuntimeDeployment {}
+message token {
+ message ReplToken {
+ message ClassroomMetadata {
+ string id = 1;
+ string language = 2;
+ }
+
+ message ReplID {
+ string id = 1;
+ string sourceRepl = 2;
+ }
+
+ enum WireFormat {
+ PROTOBUF = 0;
+ JSON = 1;
+ PID2 = 2;
+ }
+
+ message Presenced {
+ uint32 bearerID = 1;
+ string bearerName = 2;
+ }
+
+ google.protobuf.Timestamp iat = 1;
+ google.protobuf.Timestamp exp = 2;
+ string salt = 3;
+ string cluster = 4;
+ repl.Persistence persistence = 6;
+ repl.ResourceLimits resourceLimits = 10;
+ repl.ResourceLimits interactiveResourceLimits = 17;
+ token.ReplToken.WireFormat format = 12;
+ token.ReplToken.Presenced presenced = 13;
+ repeated string flags = 14;
+ repeated features.Feature features = 16;
+ repl.BuildInfo buildInfo = 18;
+ repl.Pid2Binary pid2Info = 19;
+ bool paid = 20;
+ oneof metadata {
+ repl.Repl repl = 7;
+ token.ReplToken.ReplID id = 8;
+ token.ReplToken.ClassroomMetadata classroom = 9;
+ }
+ }
+}
+
message lore {
message LoreCommand {
oneof command {
@@ -1496,6 +1676,7 @@ message lore {
message ClusterTransfer {
string replId = 1;
string user = 2;
+ lore.ReplLocation replLocation = 6;
string transferId = 4;
oneof location {
string newClusterId = 3;
@@ -1545,6 +1726,176 @@ message lore {
string replId = 1;
repeated string flags = 2;
}
+
+ message Buckets {
+ string files = 1;
+ string snapshots = 2;
+ string metadata = 3;
+ string diskBlocks = 4;
+ }
+
+ message Repl {
+ string id = 1;
+ string user = 2;
+ string slug = 3;
+ }
+
+ message Cluster {
+ string name = 1;
+ string conmanUrl = 2;
+ string gurl = 3;
+ string proxy = 4;
+ }
+
+ message CreateReplRequest {
+ message Repl {
+ string id = 1;
+ string user = 2;
+ string slug = 3;
+ }
+
+ message File {
+ string name = 1;
+ bytes contents = 2;
+ }
+
+ message SourceFiles { repeated lore.CreateReplRequest.File files = 1; }
+
+ message Buckets {
+ string files = 1;
+ string snapshots = 2;
+ }
+
+ message SourceRepl {
+ string id = 1;
+ bool requireSnapshot = 2;
+ lore.CreateReplRequest.Buckets buckets = 3;
+ }
+
+ lore.CreateReplRequest.Repl repl = 1;
+ lore.ReplLocation replLocation = 7;
+ string overrideFilesBucket = 5;
+ oneof location {
+ string cluster = 2;
+ string continent = 6;
+ }
+ oneof source {
+ lore.CreateReplRequest.SourceRepl sourceRepl = 3;
+ lore.CreateReplRequest.SourceFiles sourceFiles = 4;
+ }
+ }
+
+ message CreateReplResponse {}
+
+ message GetReplRequest { string replId = 1; }
+
+ message GetReplResponse {
+ lore.Repl repl = 1;
+ lore.Cluster cluster = 2;
+ lore.Buckets buckets = 3;
+ string dotdevHostname = 4;
+ }
+
+ message ReplLocation {
+ bool regionalGoval = 3;
+ oneof location {
+ string cluster = 1;
+ string continent = 2;
+ }
+ }
+
+ message GetReplConnectionInfoRequest {
+ string replId = 1;
+ string slug = 2;
+ string user = 3;
+ bool persistent = 4;
+ lore.ReplLocation replLocation = 9;
+ string sourceReplId = 7;
+ oneof defaultLocation {
+ string defaultCluster = 5;
+ string defaultContinent = 8;
+ }
+ }
+
+ message GetReplConnectionInfoResponse {
+ lore.Repl repl = 1;
+ lore.Cluster cluster = 2;
+ lore.Buckets buckets = 3;
+ string dotdevHostname = 4;
+ }
+
+ message GetTransferStatusRequest { string transferId = 1; }
+
+ message GetTransferStatusResponse {
+ string transferId = 1;
+ bool complete = 2;
+ }
+
+ message TransferReplsRequest {
+ string newCluster = 1;
+ repeated string replIds = 2;
+ lore.ReplLocation newLocation = 3;
+ }
+
+ message TransferReplsResponse { string transferId = 1; }
+
+ message TransferReplFromOfflineClusterRequest {
+ string newCluster = 1;
+ string replId = 2;
+ }
+
+ message TransferReplFromOfflineClusterResponse {}
+
+ message TransferUserRequest {
+ string user = 1;
+ string newCluster = 2;
+ repeated string excludedReplIds = 3;
+ }
+
+ message TransferUserResponse { string transferId = 1; }
+
+ message Continent {
+ string code = 1;
+ string name = 2;
+ }
+
+ message TakedownReplRequest { string replId = 1; }
+
+ message TakedownReplResponse {}
+
+ message SoftTakedownReplRequest { string replId = 1; }
+
+ message SoftTakedownReplResponse {}
+
+ message RestoreReplRequest { string replId = 1; }
+
+ message RestoreReplResponse {}
+
+ message BulkRemoveRequest { repeated string replIds = 1; }
+
+ message BulkRemoveResponse {}
+
+ message GetClustersRequest {}
+
+ message GetClustersResponse { repeated lore.Cluster clusters = 1; }
+
+ message PushDomainRequest {
+ string replId = 1;
+ string domain = 2;
+ string authToken = 3;
+ }
+
+ message PushDomainResponse {}
+
+ message UnlinkDomainRequest {
+ string replId = 1;
+ string domain = 2;
+ string authToken = 3;
+ }
+
+ message UnlinkDomainResponse {}
+
+ message Lore {}
}
message features {
@@ -1577,6 +1928,7 @@ message repl {
string bucket = 3;
string slug = 4;
string user = 5;
+ repl.Org org = 14;
string sourceRepl = 6;
string database = 7;
repl.Buckets buckets = 8;
@@ -1586,6 +1938,17 @@ message repl {
string logFields = 13;
}
+ message Org {
+ enum OrgType {
+ TYPE_UNSPECIFIED = 0;
+ PERSONAL = 1;
+ TEAM = 2;
+ }
+
+ string id = 1;
+ repl.Org.OrgType type = 2;
+ }
+
enum Environment {
DEVELOPMENT = 0;
PRODUCTION = 1;
@@ -1612,11 +1975,8 @@ message repl {
int64 scratchDisk = 9;
repl.ResourceLimits.Cachability cache = 6;
bool restrictNetwork = 7;
- bool preventWakeup = 8;
}
- message Permissions { bool toggleAlwaysOn = 1; }
-
enum Persistence {
PERSISTENT = 0;
EPHEMERAL = 1;
@@ -1630,7 +1990,6 @@ message repl {
repl.ResourceLimits interactiveResourceLimits = 17;
repl.Persistence persistence = 6;
repeated string flags = 14;
- repl.Permissions permissions = 15;
repeated features.Feature features = 16;
repl.BuildInfo buildInfo = 18;
}
@@ -1641,6 +2000,8 @@ message repl {
string buildId = 3;
string machineTier = 4;
}
+
+ message Pid2Binary { string version = 1; }
}
message PrivateReplsPowerup { bool enabled = 1; }
diff --git a/services/src/fsevents.rs b/services/src/fsevents.rs
new file mode 100644
index 0000000..b931259
--- /dev/null
+++ b/services/src/fsevents.rs
@@ -0,0 +1,130 @@
+pub struct FSEvents {
+ // watching: Vec
+ watcher: FSWatcher,
+}
+
+use super::traits;
+use crate::{FSEvent, FSWatcher};
+use anyhow::{format_err, Result};
+use goval::{Command, File, FileEvent};
+use tracing::{error, trace, warn};
+
+impl FSEvents {
+ pub async fn new(
+ sender: tokio::sync::mpsc::UnboundedSender,
+ ) -> Result {
+ let watcher = FSWatcher::new(sender).await?;
+
+ let chan = FSEvents {
+ // watching: vec![],
+ watcher,
+ };
+
+ Ok(chan)
+ }
+}
+
+#[async_trait::async_trait]
+impl traits::Service for FSEvents {
+ async fn open(&mut self, _info: &super::types::ChannelInfo) -> Result<()> {
+ Ok(())
+ }
+
+ async fn message(
+ &mut self,
+ _info: &super::types::ChannelInfo,
+ message: goval::Command,
+ _session: i32,
+ ) -> Result> {
+ let body = match message.body.clone() {
+ None => return Err(format_err!("Expected command body")),
+ Some(body) => body,
+ };
+
+ match body {
+ goval::command::Body::SubscribeFile(subscribe) => {
+ let mut files = vec![];
+ for file in subscribe.files {
+ files.push(file.path);
+ }
+
+ self.watcher.watch(files).await?;
+ Ok(Some(goval::Command {
+ body: Some(goval::command::Body::Ok(goval::Ok {})),
+ ..Default::default()
+ }))
+ }
+ _ => {
+ warn!(cmd = ?message, "Unknown fs event command");
+ Ok(None)
+ }
+ }
+ }
+
+ async fn fsevent(&mut self, info: &super::types::ChannelInfo, event: FSEvent) -> Result<()> {
+ trace!(?event, "fs event");
+ let file;
+ let dest;
+ let op;
+ match event {
+ FSEvent::Modify(path) => {
+ file = Some(File {
+ path,
+ ..Default::default()
+ });
+ dest = None;
+ op = goval::file_event::Op::Modify;
+ }
+ FSEvent::Create(path) => {
+ file = Some(File {
+ path,
+ ..Default::default()
+ });
+ dest = None;
+ op = goval::file_event::Op::Create;
+ }
+ FSEvent::Remove(path) => {
+ file = Some(File {
+ path,
+ ..Default::default()
+ });
+ dest = None;
+ op = goval::file_event::Op::Remove;
+ }
+ FSEvent::Rename(old_path, new_path) => {
+ file = Some(File {
+ path: new_path,
+ ..Default::default()
+ });
+ dest = Some(File {
+ path: old_path,
+ ..Default::default()
+ });
+ op = goval::file_event::Op::Move;
+ }
+ FSEvent::Err(err) => {
+ error!(err, "Error in FS event listener");
+ return Err(format_err!("{err}"));
+ }
+ };
+
+ info.send(
+ Command {
+ body: Some(goval::command::Body::FileEvent(FileEvent {
+ file,
+ dest,
+ op: op.into(),
+ })),
+ ..Default::default()
+ },
+ crate::SendSessions::Everyone,
+ )
+ .await?;
+ Ok(())
+ }
+
+ async fn shutdown(self: Box, _info: &super::types::ChannelInfo) -> Result<()> {
+ self.watcher.shutdown().await;
+ Ok(())
+ }
+}
diff --git a/services/src/lib.rs b/services/src/lib.rs
index 4dbba9b..6c9bdd5 100644
--- a/services/src/lib.rs
+++ b/services/src/lib.rs
@@ -1,6 +1,7 @@
mod chat;
mod dotreplit;
mod exec;
+mod fsevents;
mod gcsfiles;
mod git;
mod ot;
@@ -57,8 +58,10 @@ impl Channel {
"git" => Box::new(git::Git::new()),
"exec" => Box::new(exec::Exec::new()),
"dotreplit" => Box::new(dotreplit::DotReplit {}),
- "null" => Box::new(stub::Stub {}), // This channel never does anything
- "open" => Box::new(stub::Stub {}), // Stub until infra is set up to handle this
+ "fsevents" => Box::new(fsevents::FSEvents::new(sender).await?),
+ "audio" => Box::new(stub::Stub {}), // Will never be supported
+ "null" => Box::new(stub::Stub {}), // This channel never does anything
+ "open" => Box::new(stub::Stub {}), // Stub until infra is set up to handle this
_ => return Err(format_err!("Unknown service: {}", service)),
};
@@ -159,10 +162,11 @@ pub static IMPLEMENTED_SERVICES: &[&str] = &[
"snapshot",
"null",
"git",
- "open",
+ "audio",
"output",
"shell",
"toolchain",
"dotreplit",
"exec",
+ "fsevents",
];
diff --git a/services/src/output.rs b/services/src/output.rs
index a56c92f..2ecd19e 100644
--- a/services/src/output.rs
+++ b/services/src/output.rs
@@ -37,6 +37,7 @@ impl traits::Service for Output {
seconds: self.start_time.unwrap_or(0),
nanos: 0,
}),
+ ..Default::default()
};
new_frame.body = Some(goval::command::Body::OutputBlockStartEvent(event));
@@ -112,6 +113,7 @@ impl traits::Service for Output {
seconds: now,
nanos: 0,
}),
+ ..Default::default()
};
new_frame.body = Some(goval::command::Body::OutputBlockStartEvent(event));
diff --git a/services/src/stub.rs b/services/src/stub.rs
index b19fdc2..7fbcd32 100644
--- a/services/src/stub.rs
+++ b/services/src/stub.rs
@@ -1,4 +1,5 @@
pub struct Stub {}
use super::traits;
+// #[async_trait::async_trait]
impl traits::Service for Stub {}
diff --git a/src/parse_paseto.rs b/src/parse_paseto.rs
index a9042c1..975b484 100644
--- a/src/parse_paseto.rs
+++ b/src/parse_paseto.rs
@@ -150,7 +150,7 @@ pub async fn parse(token: &str) -> Result {
}
let _inner = general_purpose::STANDARD.decode(msg)?;
- let inner = goval::ReplToken::decode(_inner.as_slice())?;
+ let inner = goval::token::ReplToken::decode(_inner.as_slice())?;
match inner.presenced {
Some(user) => Ok(ClientInfo {