refactor(global): move crates around, stricter module isolation

3 files changed, 187 insertions, 0 deletions

diff --git a/crates/whirl_server/src/cmd/commands/property/create.rs b/crates/whirl_server/src/cmd/commands/property/create.rs
new file mode 100644
index 0000000..40ec2be
--- /dev/null
+++ b/crates/whirl_server/src/cmd/commands/property/create.rs
@@ -0,0 +1,168 @@
+// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective
+// SPDX-License-Identifier: GPL-3.0-only
+
+// TODO: of2m-ify?
+
+use whirl_config::Config;
+
+use crate::{
+  cmd::constants::{PROPUPD, SESSINIT},
+  net::{
+    constants::{
+      VAR_APPNAME,
+      VAR_CHANNEL,
+      VAR_ERROR,
+      VAR_EXTERNAL_HTTP_SERVER,
+      VAR_MAIL_DOMAIN,
+      VAR_PRIV,
+      VAR_PROTOCOL,
+      VAR_SCRIPT_SERVER,
+      VAR_SERIAL,
+      VAR_SERVERTYPE,
+      VAR_SMTP_SERVER,
+      VAR_UPDATETIME,
+    },
+    converter::property_list_to_bytes,
+    structure::NetworkProperty,
+  },
+};
+
+pub fn create_property_update_as_distributor() -> Vec<u8> {
+  property_list_to_bytes(
+    PROPUPD,
+    0xFF,
+    vec![
+      NetworkProperty {
+        prop_id: VAR_MAIL_DOMAIN,
+        value:   "worlds3d.com".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SMTP_SERVER,
+        value:   "mail.worlds.net:25".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SCRIPT_SERVER,
+        value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_EXTERNAL_HTTP_SERVER,
+        value:   "http://www-static.us.worlds.net".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SERVERTYPE,
+        value:   "1".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_PROTOCOL,
+        value:   "24".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_APPNAME,
+        value:   Config::get().whirlsplash.worldsmaster_username,
+      },
+    ],
+  )
+}
+
+pub fn create_property_update_as_hub() -> Vec<u8> {
+  property_list_to_bytes(
+    PROPUPD,
+    0xFF,
+    vec![
+      NetworkProperty {
+        prop_id: VAR_UPDATETIME,
+        value:   "1000000".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_MAIL_DOMAIN,
+        value:   "worlds3d.com".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SMTP_SERVER,
+        value:   "mail.worlds.net:25".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SCRIPT_SERVER,
+        value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_EXTERNAL_HTTP_SERVER,
+        value:   "http://www-static.us.worlds.net".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SERVERTYPE,
+        value:   "3".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_PROTOCOL,
+        value:   "24".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_APPNAME,
+        value:   Config::get().whirlsplash.worldsmaster_username,
+      },
+    ],
+  )
+}
+
+pub fn create_property_request_as_distributor() -> Vec<u8> {
+  property_list_to_bytes(
+    SESSINIT as i32,
+    0x01,
+    vec![
+      NetworkProperty {
+        prop_id: VAR_ERROR,
+        value:   "0".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_APPNAME,
+        value:   Config::get().whirlsplash.worldsmaster_username,
+      },
+      NetworkProperty {
+        prop_id: VAR_PROTOCOL,
+        value:   "24".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SERVERTYPE,
+        value:   "1".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SERIAL,
+        value:   "DWLV000000000000".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_PRIV,
+        value:   "0".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_CHANNEL,
+        value:   "dimension-1".to_string(),
+      },
+    ],
+  )
+}
+
+pub fn create_property_request_as_hub() -> Vec<u8> {
+  property_list_to_bytes(
+    SESSINIT as i32,
+    0x01,
+    vec![
+      NetworkProperty {
+        prop_id: VAR_ERROR,
+        value:   "0".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_SERVERTYPE,
+        value:   "3".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_UPDATETIME,
+        value:   "1000000".to_string(),
+      },
+      NetworkProperty {
+        prop_id: VAR_PROTOCOL,
+        value:   "24".to_string(),
+      },
+    ],
+  )
+}
diff --git a/crates/whirl_server/src/cmd/commands/property/mod.rs b/crates/whirl_server/src/cmd/commands/property/mod.rs
new file mode 100644
index 0000000..83b015b
--- /dev/null
+++ b/crates/whirl_server/src/cmd/commands/property/mod.rs
@@ -0,0 +1,5 @@
+// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective
+// SPDX-License-Identifier: GPL-3.0-only
+
+pub mod create;
+pub mod parse;
diff --git a/crates/whirl_server/src/cmd/commands/property/parse.rs b/crates/whirl_server/src/cmd/commands/property/parse.rs
new file mode 100644
index 0000000..415d19f
--- /dev/null
+++ b/crates/whirl_server/src/cmd/commands/property/parse.rs
@@ -0,0 +1,14 @@
+// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective
+// SPDX-License-Identifier: GPL-3.0-only
+
+use crate::net::structure::NetworkProperty;
+
+pub fn find_property_in_property_list(
+  property_list: &[NetworkProperty],
+  property: i32,
+) -> &NetworkProperty {
+  property_list
+    .iter()
+    .find(|i| i.prop_id == property)
+    .unwrap()
+}