itsi-scheduler 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08ee466c5c918a930fbb9da27b80a9d44ac3147d2107202a72351665904540d
-  data.tar.gz: 34b5bd1dc0efb3b203c49849fc45d7bf9b433df49c05e934dc1f72b2117f970b
+  metadata.gz: b9fb48a307a53aeed5d6ae3d5bcbe6bd9c06e9420645cd034813c27d7468c564
+  data.tar.gz: 5d7d60200f47f3eeff3be39bd94e84829fde9d4ae0b01f9ea6fc6cc6229312de
 SHA512:
-  metadata.gz: 6aca65a7304258e86f39ae94071e8aa1e6f902b4fb4c3c89c30be7920868b3e4ba312b392436edb248fe01f95a8deb0d84291914498bcce255d4cd5f6de8dfd5
-  data.tar.gz: 78613c2efceceb9c37dfd2f94b8a4578dffdd850ef1aaafcabfc31aae8c7b2271bc70de886259d017d5d5b1711c5e16760adaeffdc44c7d39a505b53611b5ed0
+  metadata.gz: 490e90d87ca37b16e2a697e1f32f23e288f44c76ee13a9af8cd09048ad730f72fec07dec5ded32c955cbcf863e68cc2eb36a7cea023bd80bcc41871397eb4530
+  data.tar.gz: dfda712ee4e8d385c7c7a16e7de24c404c14a817d2c4b92a784ac89d6bfad35ba7e4b74ff9b8f379e331b7107f8436c12c233b02b0313ae61546f9d4997e7756

data/Cargo.lock

@@ -11,6 +11,23 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -34,7 +51,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -45,9 +62,9 @@ checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bytes"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
@@ -73,6 +90,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -93,6 +116,27 @@ dependencies = [
  "powerfmt",
 ]
 
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "unicode-xid",
+]
+
 [[package]]
 name = "either"
 version = "1.14.0"
@@ -116,6 +160,21 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -125,30 +184,57 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
 [[package]]
 name = "itsi-scheduler"
 version = "0.1.0"
 dependencies = [
+ "bytes",
+ "derive_more",
  "itsi_error",
+ "itsi_instrument_entry",
  "itsi_rb_helpers",
  "itsi_tracing",
- "magnus 0.6.4",
+ "magnus",
+ "mio",
+ "nix",
+ "parking_lot",
+ "rb-sys",
+ "tracing",
 ]
 
 [[package]]
 name = "itsi_error"
 version = "0.1.0"
 dependencies = [
- "magnus 0.7.1",
+ "httparse",
+ "magnus",
+ "nix",
  "rcgen",
  "thiserror",
 ]
 
+[[package]]
+name = "itsi_instrument_entry"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "itsi_rb_helpers"
 version = "0.1.0"
 dependencies = [
- "magnus 0.7.1",
+ "cfg-if",
+ "magnus",
+ "nix",
  "rb-sys",
 ]
 
@@ -156,7 +242,9 @@ dependencies = [
 name = "itsi_tracing"
 version = "0.1.0"
 dependencies = [
+ "atty",
  "tracing",
+ "tracing-attributes",
  "tracing-subscriber",
 ]
 
@@ -189,22 +277,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "log"
-version = "0.4.26"
+name = "lock_api"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
 
 [[package]]
-name = "magnus"
-version = "0.6.4"
+name = "log"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479"
-dependencies = [
- "magnus-macros",
- "rb-sys",
- "rb-sys-env",
- "seq-macro",
-]
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "magnus"
@@ -227,7 +313,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -251,6 +337,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -289,6 +399,29 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.5"
@@ -350,7 +483,7 @@ dependencies = [
  "quote",
  "regex",
  "shell-words",
- "syn",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -372,6 +505,15 @@ dependencies = [
  "yasna",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -442,6 +584,18 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
 [[package]]
 name = "seq-macro"
 version = "0.3.5"
@@ -465,7 +619,19 @@ checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.140"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
 ]
 
 [[package]]
@@ -495,6 +661,17 @@ version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.98"
@@ -523,7 +700,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -574,7 +751,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -598,6 +775,16 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-serde"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.19"
@@ -608,12 +795,15 @@ dependencies = [
  "nu-ansi-term",
  "once_cell",
  "regex",
+ "serde",
+ "serde_json",
  "sharded-slab",
  "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
  "tracing-log",
+ "tracing-serde",
 ]
 
 [[package]]
@@ -622,6 +812,12 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"

data/Rakefile

@@ -3,7 +3,13 @@
 require "bundler/gem_tasks"
 require "minitest/test_task"
 
-Minitest::TestTask.create
+Minitest::TestTask.create(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.warning = false
+  t.test_globs = ['test/**/*.rb']
+  t.test_prelude = 'require "helpers/test_helper.rb"'
+end
 
 require "rubocop/rake_task"
 

data/ext/itsi_error/Cargo.toml

@@ -7,3 +7,5 @@ edition = "2024"
 thiserror = "2.0.11"
 magnus = { version = "0.7.1" }
 rcgen = "0.13.2"
+nix = "0.29.0"
+httparse = "1.10.1"

data/ext/itsi_error/src/from.rs

@@ -0,0 +1,70 @@
+use crate::ItsiError;
+use std::ffi::NulError;
+
+pub static CLIENT_CONNECTION_CLOSED: &str = "Client disconnected";
+
+impl From<httparse::Error> for ItsiError {
+    fn from(err: httparse::Error) -> Self {
+        ItsiError::ArgumentError(err.to_string())
+    }
+}
+
+impl From<nix::errno::Errno> for ItsiError {
+    fn from(err: nix::errno::Errno) -> Self {
+        ItsiError::ArgumentError(err.to_string())
+    }
+}
+
+impl From<std::io::Error> for ItsiError {
+    fn from(err: std::io::Error) -> Self {
+        ItsiError::ArgumentError(err.to_string())
+    }
+}
+
+impl From<rcgen::Error> for ItsiError {
+    fn from(err: rcgen::Error) -> Self {
+        ItsiError::ArgumentError(err.to_string())
+    }
+}
+
+impl From<NulError> for ItsiError {
+    fn from(err: NulError) -> Self {
+        ItsiError::ArgumentError(err.to_string())
+    }
+}
+
+impl From<magnus::Error> for ItsiError {
+    fn from(err: magnus::Error) -> Self {
+        match err.error_type() {
+            magnus::error::ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
+            magnus::error::ErrorType::Error(_exception_class, cow) => {
+                ItsiError::ArgumentError(cow.to_string())
+            }
+            magnus::error::ErrorType::Exception(exception) => {
+                ItsiError::ArgumentError(exception.to_string())
+            }
+        }
+    }
+}
+
+impl From<ItsiError> for magnus::Error {
+    fn from(err: ItsiError) -> Self {
+        match err {
+            ItsiError::InvalidInput(msg) => magnus::Error::new(magnus::exception::arg_error(), msg),
+            ItsiError::InternalServerError(msg) => {
+                magnus::Error::new(magnus::exception::exception(), msg)
+            }
+            ItsiError::UnsupportedProtocol(msg) => {
+                magnus::Error::new(magnus::exception::arg_error(), msg)
+            }
+            ItsiError::ArgumentError(msg) => {
+                magnus::Error::new(magnus::exception::arg_error(), msg)
+            }
+            ItsiError::Jump(msg) => magnus::Error::new(magnus::exception::local_jump_error(), msg),
+            ItsiError::Break() => magnus::Error::new(magnus::exception::interrupt(), "Break"),
+            ItsiError::ClientConnectionClosed => {
+                magnus::Error::new(magnus::exception::eof_error(), CLIENT_CONNECTION_CLOSED)
+            }
+        }
+    }
+}

data/ext/itsi_error/src/lib.rs

@@ -1,49 +1,22 @@
+pub mod from;
 use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, ItsiError>;
 
 #[derive(Error, Debug)]
 pub enum ItsiError {
-    #[error("Invalid input")]
+    #[error("Invalid input {0}")]
     InvalidInput(String),
-    #[error("Internal server error")]
-    InternalServerError,
-    #[error("Unsupported protocol")]
+    #[error("Internal server error {0}")]
+    InternalServerError(String),
+    #[error("Unsupported protocol {0}")]
     UnsupportedProtocol(String),
-    #[error("Argument error")]
+    #[error("Argument error: {0}")]
     ArgumentError(String),
+    #[error("Client Connection Closed")]
+    ClientConnectionClosed,
     #[error("Jump")]
     Jump(String),
-}
-
-impl From<ItsiError> for magnus::Error {
-    fn from(err: ItsiError) -> Self {
-        magnus::Error::new(magnus::exception::runtime_error(), err.to_string())
-    }
-}
-
-impl From<std::io::Error> for ItsiError {
-    fn from(err: std::io::Error) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<rcgen::Error> for ItsiError {
-    fn from(err: rcgen::Error) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<magnus::Error> for ItsiError {
-    fn from(err: magnus::Error) -> Self {
-        match err.error_type() {
-            magnus::error::ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
-            magnus::error::ErrorType::Error(_exception_class, cow) => {
-                ItsiError::ArgumentError(cow.to_string())
-            }
-            magnus::error::ErrorType::Exception(exception) => {
-                ItsiError::ArgumentError(exception.to_string())
-            }
-        }
-    }
+    #[error("Break")]
+    Break(),
 }

data/ext/itsi_instrument_entry/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "itsi_instrument_entry"
+version = "0.1.0"
+edition = "2021"
+authors = ["Wouter Coppieters <wc@pico.net.nz>"]
+license = "MIT"
+publish = false
+
+
+[lib]
+proc-macro = true
+[dependencies]
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full"] }

data/ext/itsi_instrument_entry/src/lib.rs

@@ -0,0 +1,31 @@
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use syn::{parse_macro_input, ItemFn};
+
+#[proc_macro_attribute]
+pub fn instrument_with_entry(attr: TokenStream, item: TokenStream) -> TokenStream {
+    let attr_tokens = TokenStream2::from(attr);
+    let input_fn = parse_macro_input!(item as ItemFn);
+    let attrs = input_fn.attrs;
+    let vis = input_fn.vis;
+    let sig = input_fn.sig;
+    let block = input_fn.block;
+    let output = quote! {
+        #[cfg(debug_assertions)]
+        #[tracing::instrument(#attr_tokens)]
+        #(#attrs)*
+        #vis #sig {
+            tracing::trace!("");
+            #block
+        }
+
+        #[cfg(not(debug_assertions))]
+        #(#attrs)*
+        #vis #sig {
+            #block
+        }
+    };
+
+    output.into()
+}

data/ext/itsi_rb_helpers/Cargo.toml

@@ -4,5 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+cfg-if = "1.0.0"
 magnus = { version = "0.7.1", features = ["rb-sys", "bytes"] }
+nix = "0.29.0"
 rb-sys = "0.9.105"