repo fixes

.gitmodules

@@ -1,27 +0,0 @@
-[submodule "external/cursive"]
-	path = external/cursive
-	url = https://gitlab.com/veilid/cursive.git
-[submodule "external/cursive_buffered_backend"]
-	path = external/cursive_buffered_backend
-	url = https://gitlab.com/veilid/cursive-buffered-backend.git
-[submodule "external/cursive-flexi-logger-view"]
-	path = external/cursive-flexi-logger-view
-	url = https://gitlab.com/veilid/cursive-flexi-logger-view.git
-[submodule "external/keyring-manager"]
-	path = external/keyring-manager
-	url = https://gitlab.com/veilid/keyring-manager.git
-[submodule "external/keyvaluedb"]
-	path = external/keyvaluedb
-	url = https://gitlab.com/veilid/keyvaluedb.git
-[submodule "external/libmdns"]
-	path = external/libmdns
-	url = https://gitlab.com/veilid/libmdns.git
-[submodule "external/mdns"]
-	path = external/mdns
-	url = https://gitlab.com/veilid/mdns.git
-[submodule "external/hashlink"]
-	path = external/hashlink
-	url = https://gitlab.com/veilid/hashlink.git
-[submodule "external/rust-igd"]
-	path = external/rust-igd
-	url = https://gitlab.com/veilid/rust-igd.git

Cargo.lock

@@ -797,6 +797,14 @@ dependencies = [
  "cmake",
 ]
 
+[[package]]
+name = "bugsalot"
+version = "0.2.2"
+source = "git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615#336a7053faadf990b9362edf5752ef34fa1f9615"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "bugsalot"
 version = "0.2.2"
@@ -1314,6 +1322,7 @@ dependencies = [
 [[package]]
 name = "cursive"
 version = "0.20.0"
+source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2"
 dependencies = [
  "ahash 0.8.3",
  "async-std",
@@ -1324,6 +1333,8 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "maplit",
+ "ncurses",
  "signal-hook",
  "tokio",
  "unicode-segmentation",
@@ -1333,6 +1344,7 @@ dependencies = [
 [[package]]
 name = "cursive-flexi-logger-view"
 version = "0.5.0"
+source = "git+https://gitlab.com/veilid/cursive-flexi-logger-view.git?rev=16722a6f4bd93dbfb32bf5d88eaafa44fffc51a3#16722a6f4bd93dbfb32bf5d88eaafa44fffc51a3"
 dependencies = [
  "arraydeque",
  "cursive",
@@ -1347,6 +1359,7 @@ dependencies = [
 [[package]]
 name = "cursive-macros"
 version = "0.1.0"
+source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1355,7 +1368,8 @@ dependencies = [
 
 [[package]]
 name = "cursive_buffered_backend"
-version = "0.6.1-pre"
+version = "0.6.1"
+source = "git+https://gitlab.com/veilid/cursive-buffered-backend.git?rev=dd6b0276050e041d8f194cf415da5e1481f91370#dd6b0276050e041d8f194cf415da5e1481f91370"
 dependencies = [
  "cursive_core",
  "enumset",
@@ -1368,6 +1382,7 @@ dependencies = [
 [[package]]
 name = "cursive_core"
 version = "0.3.7"
+source = "git+https://gitlab.com/veilid/cursive.git?rev=631dad18f0b4b246914998e8952da8abb6093bd2#631dad18f0b4b246914998e8952da8abb6093bd2"
 dependencies = [
  "ahash 0.8.3",
  "ansi-parser",
@@ -2286,6 +2301,7 @@ dependencies = [
 [[package]]
 name = "hashlink"
 version = "0.8.2"
+source = "git+https://gitlab.com/veilid/hashlink.git?rev=add585db56765b4553b45d535e0f8d0a62a975c6#add585db56765b4553b45d535e0f8d0a62a975c6"
 dependencies = [
  "hashbrown 0.13.2",
  "serde",
@@ -2522,6 +2538,7 @@ dependencies = [
 [[package]]
 name = "igd"
 version = "0.12.1"
+source = "git+https://gitlab.com/veilid/rust-igd.git?rev=85a15fcdd9120c553345a1fe9b14256779c79548#85a15fcdd9120c553345a1fe9b14256779c79548"
 dependencies = [
  "attohttpc",
  "log",
@@ -2719,6 +2736,7 @@ dependencies = [
 [[package]]
 name = "keyring-manager"
 version = "0.5.0"
+source = "git+https://gitlab.com/veilid/keyring-manager.git?rev=e00be7d4130f3e3f69548121de26b24aeb935df2#e00be7d4130f3e3f69548121de26b24aeb935df2"
 dependencies = [
  "byteorder",
  "cfg-if 1.0.0",
@@ -2744,6 +2762,7 @@ dependencies = [
 [[package]]
 name = "keyvaluedb"
 version = "0.1.0"
+source = "git+https://gitlab.com/veilid/keyvaluedb.git?rev=1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0#1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0"
 dependencies = [
  "smallvec",
 ]
@@ -2751,6 +2770,7 @@ dependencies = [
 [[package]]
 name = "keyvaluedb-memorydb"
 version = "0.1.0"
+source = "git+https://gitlab.com/veilid/keyvaluedb.git?rev=1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0#1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0"
 dependencies = [
  "keyvaluedb",
  "parking_lot 0.12.1",
@@ -2759,6 +2779,7 @@ dependencies = [
 [[package]]
 name = "keyvaluedb-sqlite"
 version = "0.1.0"
+source = "git+https://gitlab.com/veilid/keyvaluedb.git?rev=1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0#1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0"
 dependencies = [
  "hex",
  "keyvaluedb",
@@ -2770,6 +2791,7 @@ dependencies = [
 [[package]]
 name = "keyvaluedb-web"
 version = "0.1.0"
+source = "git+https://gitlab.com/veilid/keyvaluedb.git?rev=1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0#1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0"
 dependencies = [
  "async-lock",
  "flume",
@@ -2905,6 +2927,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -2934,9 +2962,9 @@ checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
 
 [[package]]
 name = "memchr"
-version = "2.6.2"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memoffset"
@@ -3021,6 +3049,17 @@ dependencies = [
  "socket2 0.4.9",
 ]
 
+[[package]]
+name = "ncurses"
+version = "5.101.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5d34d72657dc4b638a1c25d40aae81e4f1c699062f72f467237920752032"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "ndk"
 version = "0.7.0"
@@ -4082,13 +4121,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.7",
+ "regex-automata 0.3.8",
  "regex-syntax 0.7.5",
 ]
 
@@ -4103,9 +4142,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5605,7 +5644,7 @@ dependencies = [
  "arboard",
  "async-std",
  "async-tungstenite 0.8.0",
- "bugsalot",
+ "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615)",
  "cfg-if 1.0.0",
  "clap 4.4.2",
  "config",
@@ -5648,7 +5687,7 @@ dependencies = [
  "async_executors",
  "backtrace",
  "blake3",
- "bugsalot",
+ "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git?rev=336a7053faadf990b9362edf5752ef34fa1f9615)",
  "capnp",
  "capnpc",
  "cfg-if 1.0.0",
@@ -5775,7 +5814,7 @@ dependencies = [
  "async-std",
  "async-tungstenite 0.23.0",
  "backtrace",
- "bugsalot",
+ "bugsalot 0.2.2 (git+https://github.com/crioux/bugsalot.git)",
  "cfg-if 1.0.0",
  "clap 4.4.2",
  "color-eyre",

Cargo.toml

@@ -7,11 +7,11 @@ members = [
     "veilid-flutter/rust",
     "veilid-wasm",
 ]
-exclude = [ "./external" ]
+exclude = ["./external"]
 
 [patch.crates-io]
-cursive = { path = "./external/cursive/cursive" }
+cursive = { version = "0.20.0", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2" }
-cursive_core = { path = "./external/cursive/cursive-core" }
+cursive_core = { version = "0.3.7", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2" }
 
 [profile.release]
 opt-level = "s"

Earthfile

@@ -74,14 +74,14 @@ deps-linux:
 # Code + Linux deps
 code-linux:
     FROM +deps-linux
-    COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid
+    COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid
     RUN cat /veilid/scripts/earthly/cargo-linux/config.toml >> /veilid/.cargo/config.toml
     WORKDIR /veilid
 
 # Code + Linux + Android deps
 code-android:
     FROM +deps-android
-    COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid
+    COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml /veilid
     RUN cat /veilid/scripts/earthly/cargo-linux/config.toml >> /veilid/.cargo/config.toml
     RUN cat /veilid/scripts/earthly/cargo-android/config.toml >> /veilid/.cargo/config.toml
     WORKDIR /veilid
@@ -191,7 +191,7 @@ package-linux-amd64-rpm:
     ### RPMBUILD .RPM FILES
     #################################
     RUN mkdir -p /veilid/target
-    COPY --dir .cargo external files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid
+    COPY --dir .cargo files scripts veilid-cli veilid-core veilid-server veilid-tools veilid-flutter veilid-wasm Cargo.lock Cargo.toml package /veilid
     COPY +build-linux-amd64/x86_64-unknown-linux-gnu /veilid/target/x86_64-unknown-linux-gnu
     RUN mkdir -p /rpm-work-dir/veilid-server
     # veilid-server

veilid-cli/Cargo.toml

@@ -28,13 +28,13 @@ async-std = { version = "^1.9", features = [
 tokio = { version = "^1", features = ["full"], optional = true }
 tokio-util = { version = "^0", features = ["compat"], optional = true }
 async-tungstenite = { version = "^0.8" }
-cursive = { path = "../external/cursive/cursive", default-features = false, features = [
+cursive = { version = "0.20.0", git = "https://gitlab.com/veilid/cursive.git", rev = "631dad18f0b4b246914998e8952da8abb6093bd2", default-features = false, features = [
     "crossterm",
     "toml",
     "ansi",
 ] }
-cursive-flexi-logger-view = { path = "../external/cursive-flexi-logger-view" }
+cursive-flexi-logger-view = { version = "0.5.0", git = "https://gitlab.com/veilid/cursive-flexi-logger-view.git", rev = "16722a6f4bd93dbfb32bf5d88eaafa44fffc51a3" }
-cursive_buffered_backend = { path = "../external/cursive_buffered_backend" }
+cursive_buffered_backend = { version = "0.6.1", git = "https://gitlab.com/veilid/cursive-buffered-backend.git", rev = "dd6b0276050e041d8f194cf415da5e1481f91370" }
 # cursive-multiplex = "0.6.0"
 # cursive_tree_view = "0.6.0"
 cursive_table_view = "0.14.0"
@@ -49,12 +49,13 @@ serde_derive = "^1"
 parking_lot = "^0"
 cfg-if = "^1"
 config = { version = "^0", features = ["yaml"] }
-bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
+bugsalot = { version = "0.2.2", git = "https://github.com/crioux/bugsalot.git", rev = "336a7053faadf990b9362edf5752ef34fa1f9615" }
 flexi_logger = { version = "^0", features = ["use_chrono_for_offset"] }
 thiserror = "^1"
 crossbeam-channel = "^0"
 hex = "^0"
-veilid-tools = { path = "../veilid-tools" }
+veilid-tools = { version = "0.2.0", path = "../veilid-tools" }
+
 json = "^0"
 stop-token = { version = "^0", default-features = false }
 flume = { version = "^0", features = ["async"] }

veilid-core/Cargo.toml

@@ -59,7 +59,7 @@ network-result-extra = ["veilid-tools/network-result-extra"]
 [dependencies]
 
 # Tools
-veilid-tools = { path = "../veilid-tools", features = [
+veilid-tools = { version = "0.2.0", path = "../veilid-tools", features = [
     "tracing",
 ], default-features = false }
 paste = "1.0.14"
@@ -83,11 +83,13 @@ thiserror = "1.0.47"
 
 # Data structures
 enumset = { version = "1.1.2", features = ["serde"] }
-keyvaluedb = { path = "../external/keyvaluedb/keyvaluedb" }
+keyvaluedb = { version = "0.1.0", git = "https://gitlab.com/veilid/keyvaluedb.git", rev = "1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0" }
 range-set-blaze = "0.1.9"
 weak-table = "0.3.2"
 generic-array = "0.14.7"
-hashlink = { path = "../external/hashlink", features = ["serde_impl"] }
+hashlink = { version = "0.8.2", git = "https://gitlab.com/veilid/hashlink.git", rev = "add585db56765b4553b45d535e0f8d0a62a975c6", features = [
+    "serde_impl",
+] }
 
 # System
 futures-util = { version = "0.3.28", default_features = false, features = [
@@ -145,7 +147,7 @@ lz4_flex = { version = "0.11.1", default-features = false, features = [
 
 # Tools
 config = { version = "0.13.3", features = ["yaml"] }
-bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
+bugsalot = { version = "0.2.2", git = "https://github.com/crioux/bugsalot.git", rev = "336a7053faadf990b9362edf5752ef34fa1f9615" }
 chrono = "0.4.26"
 libc = "0.2.147"
 nix = "0.26.2"
@@ -164,12 +166,12 @@ futures-util = { version = "0.3.28", default-features = false, features = [
 ] }
 
 # Data structures
-keyring-manager = { path = "../external/keyring-manager" }
+keyring-manager = { version = "0.5.0", git = "https://gitlab.com/veilid/keyring-manager.git", rev = "e00be7d4130f3e3f69548121de26b24aeb935df2" }
-keyvaluedb-sqlite = { path = "../external/keyvaluedb/keyvaluedb-sqlite" }
+keyvaluedb-sqlite = { version = "0.1.0", git = "https://gitlab.com/veilid/keyvaluedb.git", rev = "1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0" }
 
 # Network
 async-tungstenite = { version = "0.23.0", features = ["async-tls"] }
-igd = { path = "../external/rust-igd" }
+igd = { version = "0.12.1", git = "https://gitlab.com/veilid/rust-igd.git", rev = "85a15fcdd9120c553345a1fe9b14256779c79548" }
 async-tls = "0.12.0"
 webpki = "0.22.0"
 webpki-roots = "0.25.2"
@@ -180,7 +182,7 @@ socket2 = { version = "0.5.3", features = ["all"] }
 # Dependencies for WASM builds only
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 
-veilid-tools = { path = "../veilid-tools", default-features = false, features = [
+veilid-tools = { version = "0.2.0", path = "../veilid-tools", default-features = false, features = [
     "rt-wasm-bindgen",
 ] }
 
@@ -206,7 +208,7 @@ wasm-logger = "0.2.0"
 tracing-wasm = "0.2.1"
 
 # Data Structures
-keyvaluedb-web = { path = "../external/keyvaluedb/keyvaluedb-web" }
+keyvaluedb-web = { version = "0.1.0", git = "https://gitlab.com/veilid/keyvaluedb.git", rev = "1430135c7e3b1d0176c0b45f64e8c0a9d85d44d0" }
 
 ### Configuration for WASM32 'web-sys' crate
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]

veilid-flutter/example/pubspec.lock

@@ -403,7 +403,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.10"
+    version: "0.2.0"
   web:
     dependency: transitive
     description:

veilid-wasm/Cargo.toml

@@ -15,7 +15,7 @@ default = ["veilid-core/default-wasm"]
 crypto-test = ["veilid-core/crypto-test"]
 
 [dependencies]
-veilid-core = { path = "../veilid-core", default-features = false }
+veilid-core = { version = "0.2.0", path = "../veilid-core", default-features = false }
 
 tracing = { version = "^0", features = ["log", "attributes"] }
 tracing-wasm = "^0"