@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.devalang +9 -10
- package/Cargo.toml +5 -4
- package/README.md +7 -5
- package/docs/CHANGELOG.md +42 -0
- package/docs/ROADMAP.md +5 -1
- package/docs/TODO.md +3 -14
- package/examples/bus.deva +10 -0
- package/examples/effect.deva +2 -0
- package/examples/filter.deva +11 -0
- package/examples/lfo.deva +9 -0
- package/examples/synth.deva +11 -1
- package/examples/synth_types.deva +17 -0
- package/out-tsc/core/functions/index.d.ts +5 -0
- package/out-tsc/core/functions/index.js +11 -0
- package/out-tsc/pkg/devalang_core.d.ts +2 -0
- package/out-tsc/pkg/devalang_core.js +17 -2
- package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -7
- package/package.json +1 -1
- package/project-version.json +3 -3
- package/rust/cli/bank/api.rs +122 -122
- package/rust/cli/bank/commands.rs +33 -2
- package/rust/cli/bank/mod.rs +29 -29
- package/rust/cli/build/commands.rs +53 -3
- package/rust/cli/build/mod.rs +2 -2
- package/rust/cli/build/process.rs +26 -7
- package/rust/cli/check/mod.rs +2 -2
- package/rust/cli/discover/commands.rs +253 -253
- package/rust/cli/discover/config.rs +111 -111
- package/rust/cli/discover/fs.rs +19 -19
- package/rust/cli/discover/install.rs +103 -103
- package/rust/cli/discover/metadata.rs +48 -48
- package/rust/cli/discover/mod.rs +5 -5
- package/rust/cli/install/addon.rs +118 -118
- package/rust/cli/install/bank.rs +22 -3
- package/rust/cli/install/commands.rs +35 -35
- package/rust/cli/install/mod.rs +4 -4
- package/rust/cli/install/plugin.rs +80 -61
- package/rust/cli/login/commands.rs +124 -124
- package/rust/cli/mod.rs +12 -12
- package/rust/cli/parser.rs +46 -1
- package/rust/cli/play/commands.rs +71 -20
- package/rust/cli/play/mod.rs +5 -5
- package/rust/cli/play/process.rs +14 -5
- package/rust/cli/play/realtime.rs +91 -91
- package/rust/cli/telemetry/commands.rs +22 -22
- package/rust/cli/telemetry/event_creator.rs +80 -80
- package/rust/cli/telemetry/mod.rs +3 -3
- package/rust/cli/telemetry/send.rs +51 -51
- package/rust/cli/template/commands.rs +69 -69
- package/rust/config/driver.rs +112 -103
- package/rust/config/mod.rs +3 -3
- package/rust/config/ops.rs +26 -26
- package/rust/config/settings.rs +101 -101
- package/rust/core/audio/engine/driver.rs +220 -0
- package/rust/core/audio/engine/export.rs +169 -0
- package/rust/core/audio/engine/helpers.rs +178 -170
- package/rust/core/audio/engine/mod.rs +51 -2
- package/rust/core/audio/engine/notes/dsp.rs +85 -0
- package/rust/core/audio/engine/notes/mod.rs +44 -0
- package/rust/core/audio/engine/notes/params.rs +294 -0
- package/rust/core/audio/engine/sample/insert.rs +199 -0
- package/rust/core/audio/engine/sample/mod.rs +40 -0
- package/rust/core/audio/engine/sample/padding.rs +170 -0
- package/rust/core/audio/evaluator/condition.rs +61 -0
- package/rust/core/audio/evaluator/mod.rs +9 -0
- package/rust/core/audio/{evaluator.rs → evaluator/numeric.rs} +1 -159
- package/rust/core/audio/evaluator/rhs.rs +16 -0
- package/rust/core/audio/evaluator/string_expr.rs +94 -0
- package/rust/core/audio/interpreter/driver.rs +55 -23
- package/rust/core/audio/interpreter/mod.rs +1 -13
- package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +175 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +384 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +2 -0
- package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +316 -0
- package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -0
- package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -0
- package/rust/core/audio/interpreter/{automate.rs → statements/automate.rs} +16 -18
- package/rust/core/audio/interpreter/{call.rs → statements/call.rs} +5 -4
- package/rust/core/audio/interpreter/{condition.rs → statements/condition.rs} +2 -1
- package/rust/core/audio/interpreter/{function.rs → statements/function.rs} +2 -4
- package/rust/core/audio/interpreter/{let_.rs → statements/let_.rs} +2 -4
- package/rust/core/audio/interpreter/{load.rs → statements/load.rs} +2 -4
- package/rust/core/audio/interpreter/{loop_.rs → statements/loop_.rs} +2 -1
- package/rust/core/audio/interpreter/statements/mod.rs +12 -0
- package/rust/core/audio/interpreter/{sleep.rs → statements/sleep.rs} +28 -28
- package/rust/core/audio/interpreter/{spawn.rs → statements/spawn.rs} +3 -2
- package/rust/core/audio/interpreter/{tempo.rs → statements/tempo.rs} +40 -40
- package/rust/core/audio/interpreter/{trigger.rs → statements/trigger.rs} +1 -1
- package/rust/core/audio/loader/trigger.rs +2 -1
- package/rust/core/audio/mod.rs +6 -7
- package/rust/core/audio/player.rs +70 -70
- package/rust/core/audio/special/easing.rs +189 -189
- package/rust/core/audio/special/env.rs +45 -45
- package/rust/core/audio/special/math.rs +134 -134
- package/rust/core/audio/special/mod.rs +9 -9
- package/rust/core/audio/special/modulator.rs +143 -143
- package/rust/core/builder/mod.rs +45 -2
- package/rust/core/debugger/lexer.rs +27 -27
- package/rust/core/debugger/{module.rs → logs.rs} +3 -6
- package/rust/core/debugger/mod.rs +30 -30
- package/rust/core/debugger/preprocessor.rs +27 -27
- package/rust/core/debugger/store.rs +2 -4
- package/rust/core/error/mod.rs +269 -269
- package/rust/core/lexer/driver.rs +59 -61
- package/rust/core/lexer/handler/arrow.rs +82 -82
- package/rust/core/lexer/handler/at.rs +21 -21
- package/rust/core/lexer/handler/brace.rs +41 -41
- package/rust/core/lexer/handler/colon.rs +21 -21
- package/rust/core/lexer/handler/comment.rs +30 -30
- package/rust/core/lexer/handler/dot.rs +21 -21
- package/rust/core/lexer/handler/driver.rs +337 -337
- package/rust/core/lexer/handler/identifier.rs +47 -47
- package/rust/core/lexer/handler/indent.rs +66 -66
- package/rust/core/lexer/handler/mod.rs +15 -15
- package/rust/core/lexer/handler/newline.rs +23 -23
- package/rust/core/lexer/handler/number.rs +31 -31
- package/rust/core/lexer/handler/operator.rs +46 -46
- package/rust/core/lexer/handler/parenthesis.rs +41 -41
- package/rust/core/lexer/handler/slash.rs +21 -21
- package/rust/core/lexer/handler/string.rs +63 -63
- package/rust/core/lexer/mod.rs +3 -3
- package/rust/core/mod.rs +0 -1
- package/rust/core/parser/driver/block.rs +111 -0
- package/rust/core/parser/driver/cursor.rs +82 -0
- package/rust/core/parser/driver/driver_impl.rs +139 -0
- package/rust/core/parser/driver/mod.rs +6 -0
- package/rust/core/parser/driver/parse_array.rs +120 -0
- package/rust/core/parser/driver/parse_map.rs +223 -0
- package/rust/core/parser/driver/parser.rs +160 -0
- package/rust/core/parser/handler/arrow_call.rs +28 -4
- package/rust/core/parser/handler/at.rs +279 -279
- package/rust/core/parser/handler/bank.rs +104 -104
- package/rust/core/parser/handler/condition.rs +83 -83
- package/rust/core/parser/handler/dot.rs +148 -148
- package/rust/core/parser/handler/identifier/automate.rs +254 -254
- package/rust/core/parser/handler/identifier/call.rs +91 -91
- package/rust/core/parser/handler/identifier/emit.rs +70 -70
- package/rust/core/parser/handler/identifier/function.rs +113 -113
- package/rust/core/parser/handler/identifier/group.rs +89 -89
- package/rust/core/parser/handler/identifier/let_.rs +173 -173
- package/rust/core/parser/handler/identifier/mod.rs +55 -55
- package/rust/core/parser/handler/identifier/on.rs +107 -107
- package/rust/core/parser/handler/identifier/print.rs +49 -49
- package/rust/core/parser/handler/identifier/sleep.rs +96 -43
- package/rust/core/parser/handler/identifier/spawn.rs +91 -91
- package/rust/core/parser/handler/identifier/synth.rs +135 -135
- package/rust/core/parser/handler/loop_.rs +194 -194
- package/rust/core/parser/handler/mod.rs +9 -9
- package/rust/core/parser/handler/pattern.rs +1 -1
- package/rust/core/parser/handler/tempo.rs +105 -57
- package/rust/core/parser/statement.rs +10 -11
- package/rust/core/plugin/loader.rs +1 -1
- package/rust/core/plugin/mod.rs +2 -2
- package/rust/core/plugin/runner/mod.rs +11 -0
- package/rust/core/plugin/{runner.rs → runner/non_wasm.rs} +297 -347
- package/rust/core/plugin/runner/wasm32.rs +43 -0
- package/rust/core/preprocessor/loader/inject.rs +278 -0
- package/rust/core/preprocessor/loader/loader_helpers.rs +110 -0
- package/rust/core/preprocessor/loader/mod.rs +235 -0
- package/rust/core/preprocessor/module.rs +2 -7
- package/rust/core/preprocessor/{processor.rs → processor/handlers.rs} +6 -13
- package/rust/core/preprocessor/processor/mod.rs +1 -0
- package/rust/core/preprocessor/resolver/bank.rs +49 -49
- package/rust/core/preprocessor/resolver/call.rs +124 -124
- package/rust/core/preprocessor/resolver/condition.rs +95 -95
- package/rust/core/preprocessor/resolver/driver.rs +324 -324
- package/rust/core/preprocessor/resolver/function.rs +2 -2
- package/rust/core/preprocessor/resolver/group.rs +46 -18
- package/rust/core/preprocessor/resolver/let_.rs +32 -32
- package/rust/core/preprocessor/resolver/loop_.rs +318 -318
- package/rust/core/preprocessor/resolver/mod.rs +16 -16
- package/rust/core/preprocessor/resolver/pattern.rs +83 -83
- package/rust/core/preprocessor/resolver/spawn.rs +99 -99
- package/rust/core/preprocessor/resolver/synth.rs +54 -54
- package/rust/core/preprocessor/resolver/tempo.rs +48 -48
- package/rust/core/preprocessor/resolver/trigger.rs +116 -116
- package/rust/core/preprocessor/resolver/value.rs +176 -176
- package/rust/core/store/global.rs +2 -6
- package/rust/core/store/mod.rs +1 -5
- package/rust/lib.rs +18 -3
- package/rust/main.rs +27 -3
- package/rust/types/Cargo.toml +1 -1
- package/rust/types/src/addons.rs +55 -55
- package/rust/types/src/config.rs +84 -74
- package/rust/types/src/lib.rs +15 -12
- package/rust/types/src/plugin.rs +20 -0
- package/rust/types/src/store.rs +139 -0
- package/rust/types/src/telemetry.rs +85 -85
- package/rust/utils/Cargo.toml +2 -2
- package/rust/utils/src/file.rs +94 -94
- package/rust/utils/src/first_usage.rs +97 -97
- package/rust/utils/src/lib.rs +9 -9
- package/rust/utils/src/logger.rs +200 -200
- package/rust/utils/src/path.rs +129 -88
- package/rust/utils/src/signature.rs +41 -41
- package/rust/utils/src/spinner.rs +20 -20
- package/rust/utils/src/version.rs +27 -27
- package/rust/utils/src/watcher.rs +46 -46
- package/rust/web/api.rs +5 -5
- package/rust/web/cdn.rs +34 -34
- package/rust/web/mod.rs +3 -3
- package/tests/integration.rs +21 -21
- package/typescript/core/functions/index.ts +11 -0
- package/typescript/pkg/devalang_core.ts +20 -4
- package/rust/core/audio/engine/sample.rs +0 -366
- package/rust/core/audio/engine/synth.rs +0 -325
- package/rust/core/audio/interpreter/arrow_call.rs +0 -311
- package/rust/core/audio/renderer.rs +0 -54
- package/rust/core/parser/driver.rs +0 -584
- package/rust/core/preprocessor/loader.rs +0 -637
- package/rust/core/store/export.rs +0 -28
- package/rust/core/store/function.rs +0 -40
- package/rust/core/store/import.rs +0 -28
- package/rust/core/store/variable.rs +0 -51
- package/rust/core/utils/mod.rs +0 -1
- package/rust/core/utils/path.rs +0 -37
|
@@ -1,91 +1,91 @@
|
|
|
1
|
-
use std::sync::Arc;
|
|
2
|
-
use std::sync::atomic::{AtomicBool, Ordering};
|
|
3
|
-
use std::time::Duration;
|
|
4
|
-
|
|
5
|
-
use devalang_types::Value;
|
|
6
|
-
|
|
7
|
-
pub struct RtRunner {
|
|
8
|
-
pub stop: Arc<AtomicBool>,
|
|
9
|
-
pub handle: std::thread::JoinHandle<()>,
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
pub struct RtContext {
|
|
13
|
-
pub bpm: f32,
|
|
14
|
-
pub entry_stmts: Vec<crate::core::parser::statement::Statement>,
|
|
15
|
-
pub variables:
|
|
16
|
-
pub functions:
|
|
17
|
-
pub global_store: crate::core::store::global::GlobalStore,
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
pub fn start_realtime_runner(ctx: RtContext, total_secs: f32) -> RtRunner {
|
|
21
|
-
use crate::core::audio::engine::AudioEngine;
|
|
22
|
-
use crate::core::audio::interpreter::driver::execute_audio_block;
|
|
23
|
-
use crate::core::parser::statement::StatementKind;
|
|
24
|
-
use devalang_utils::logger::Logger;
|
|
25
|
-
|
|
26
|
-
let stop = Arc::new(AtomicBool::new(false));
|
|
27
|
-
let stop_clone = stop.clone();
|
|
28
|
-
|
|
29
|
-
let handle = std::thread::spawn(move || {
|
|
30
|
-
let _logger = Logger::new();
|
|
31
|
-
let bpm = if ctx.bpm > 0.0 { ctx.bpm } else { 120.0 };
|
|
32
|
-
let beat_secs = 60.0f32 / bpm;
|
|
33
|
-
let mut elapsed = 0.0f32;
|
|
34
|
-
|
|
35
|
-
let mut variables = ctx.variables.clone();
|
|
36
|
-
variables.set("__rt".to_string(), Value::Boolean(true));
|
|
37
|
-
let functions = ctx.functions.clone();
|
|
38
|
-
let _global_store = ctx.global_store.clone();
|
|
39
|
-
let mut audio_engine = AudioEngine::new("rt".to_string());
|
|
40
|
-
|
|
41
|
-
let i: usize = 0;
|
|
42
|
-
let mut _current_loop: Option<()> = None; // simplified state
|
|
43
|
-
let mut _beat_index: u64 = 0;
|
|
44
|
-
while elapsed + 1e-3 < total_secs && i < ctx.entry_stmts.len() {
|
|
45
|
-
if stop_clone.load(Ordering::Relaxed) {
|
|
46
|
-
break;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
std::thread::sleep(Duration::from_secs_f32(beat_secs));
|
|
50
|
-
elapsed += beat_secs;
|
|
51
|
-
_beat_index += 1;
|
|
52
|
-
if stop_clone.load(Ordering::Relaxed) {
|
|
53
|
-
break;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
// Only fire periodic handlers when not in a loop - simplified
|
|
57
|
-
if let Some(handlers) = ctx.global_store.get_event_handlers("beat") {
|
|
58
|
-
for h in handlers {
|
|
59
|
-
if let StatementKind::On { body, .. } = &h.kind {
|
|
60
|
-
let _ = execute_audio_block(
|
|
61
|
-
&mut audio_engine,
|
|
62
|
-
&ctx.global_store,
|
|
63
|
-
variables.clone(),
|
|
64
|
-
functions.clone(),
|
|
65
|
-
body,
|
|
66
|
-
bpm,
|
|
67
|
-
60.0 / bpm,
|
|
68
|
-
0.0,
|
|
69
|
-
0.0,
|
|
70
|
-
);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
});
|
|
76
|
-
|
|
77
|
-
RtRunner { stop, handle }
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
pub fn stop_realtime_runner(runner_opt: &mut Option<RtRunner>) {
|
|
81
|
-
if let Some(r) = runner_opt.take() {
|
|
82
|
-
r.stop.store(true, Ordering::Relaxed);
|
|
83
|
-
let _ = r.handle.join();
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
pub fn join_realtime_runner(runner_opt: &mut Option<RtRunner>) {
|
|
88
|
-
if let Some(r) = runner_opt.take() {
|
|
89
|
-
let _ = r.handle.join();
|
|
90
|
-
}
|
|
91
|
-
}
|
|
1
|
+
use std::sync::Arc;
|
|
2
|
+
use std::sync::atomic::{AtomicBool, Ordering};
|
|
3
|
+
use std::time::Duration;
|
|
4
|
+
|
|
5
|
+
use devalang_types::Value;
|
|
6
|
+
|
|
7
|
+
pub struct RtRunner {
|
|
8
|
+
pub stop: Arc<AtomicBool>,
|
|
9
|
+
pub handle: std::thread::JoinHandle<()>,
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
pub struct RtContext {
|
|
13
|
+
pub bpm: f32,
|
|
14
|
+
pub entry_stmts: Vec<crate::core::parser::statement::Statement>,
|
|
15
|
+
pub variables: devalang_types::store::VariableTable,
|
|
16
|
+
pub functions: devalang_types::store::FunctionTable,
|
|
17
|
+
pub global_store: crate::core::store::global::GlobalStore,
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
pub fn start_realtime_runner(ctx: RtContext, total_secs: f32) -> RtRunner {
|
|
21
|
+
use crate::core::audio::engine::AudioEngine;
|
|
22
|
+
use crate::core::audio::interpreter::driver::execute_audio_block;
|
|
23
|
+
use crate::core::parser::statement::StatementKind;
|
|
24
|
+
use devalang_utils::logger::Logger;
|
|
25
|
+
|
|
26
|
+
let stop = Arc::new(AtomicBool::new(false));
|
|
27
|
+
let stop_clone = stop.clone();
|
|
28
|
+
|
|
29
|
+
let handle = std::thread::spawn(move || {
|
|
30
|
+
let _logger = Logger::new();
|
|
31
|
+
let bpm = if ctx.bpm > 0.0 { ctx.bpm } else { 120.0 };
|
|
32
|
+
let beat_secs = 60.0f32 / bpm;
|
|
33
|
+
let mut elapsed = 0.0f32;
|
|
34
|
+
|
|
35
|
+
let mut variables = ctx.variables.clone();
|
|
36
|
+
variables.set("__rt".to_string(), Value::Boolean(true));
|
|
37
|
+
let functions = ctx.functions.clone();
|
|
38
|
+
let _global_store = ctx.global_store.clone();
|
|
39
|
+
let mut audio_engine = AudioEngine::new("rt".to_string());
|
|
40
|
+
|
|
41
|
+
let i: usize = 0;
|
|
42
|
+
let mut _current_loop: Option<()> = None; // simplified state
|
|
43
|
+
let mut _beat_index: u64 = 0;
|
|
44
|
+
while elapsed + 1e-3 < total_secs && i < ctx.entry_stmts.len() {
|
|
45
|
+
if stop_clone.load(Ordering::Relaxed) {
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
std::thread::sleep(Duration::from_secs_f32(beat_secs));
|
|
50
|
+
elapsed += beat_secs;
|
|
51
|
+
_beat_index += 1;
|
|
52
|
+
if stop_clone.load(Ordering::Relaxed) {
|
|
53
|
+
break;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// Only fire periodic handlers when not in a loop - simplified
|
|
57
|
+
if let Some(handlers) = ctx.global_store.get_event_handlers("beat") {
|
|
58
|
+
for h in handlers {
|
|
59
|
+
if let StatementKind::On { body, .. } = &h.kind {
|
|
60
|
+
let _ = execute_audio_block(
|
|
61
|
+
&mut audio_engine,
|
|
62
|
+
&ctx.global_store,
|
|
63
|
+
variables.clone(),
|
|
64
|
+
functions.clone(),
|
|
65
|
+
body,
|
|
66
|
+
bpm,
|
|
67
|
+
60.0 / bpm,
|
|
68
|
+
0.0,
|
|
69
|
+
0.0,
|
|
70
|
+
);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
RtRunner { stop, handle }
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
pub fn stop_realtime_runner(runner_opt: &mut Option<RtRunner>) {
|
|
81
|
+
if let Some(r) = runner_opt.take() {
|
|
82
|
+
r.stop.store(true, Ordering::Relaxed);
|
|
83
|
+
let _ = r.handle.join();
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
pub fn join_realtime_runner(runner_opt: &mut Option<RtRunner>) {
|
|
88
|
+
if let Some(r) = runner_opt.take() {
|
|
89
|
+
let _ = r.handle.join();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
use crate::config::settings::set_user_config_value;
|
|
2
|
-
use devalang_utils::logger::{LogLevel, Logger};
|
|
3
|
-
|
|
4
|
-
#[cfg(feature = "cli")]
|
|
5
|
-
pub async fn handle_telemetry_enable_command() -> Result<(), String> {
|
|
6
|
-
set_user_config_value("telemetry", serde_json::Value::Bool(true));
|
|
7
|
-
|
|
8
|
-
let logger = Logger::new();
|
|
9
|
-
logger.log_message(LogLevel::Info, "Telemetry has been enabled.");
|
|
10
|
-
|
|
11
|
-
Ok(())
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
#[cfg(feature = "cli")]
|
|
15
|
-
pub async fn handle_telemetry_disable_command() -> Result<(), String> {
|
|
16
|
-
set_user_config_value("telemetry", serde_json::Value::Bool(false));
|
|
17
|
-
|
|
18
|
-
let logger = Logger::new();
|
|
19
|
-
logger.log_message(LogLevel::Info, "Telemetry has been disabled.");
|
|
20
|
-
|
|
21
|
-
Ok(())
|
|
22
|
-
}
|
|
1
|
+
use crate::config::settings::set_user_config_value;
|
|
2
|
+
use devalang_utils::logger::{LogLevel, Logger};
|
|
3
|
+
|
|
4
|
+
#[cfg(feature = "cli")]
|
|
5
|
+
pub async fn handle_telemetry_enable_command() -> Result<(), String> {
|
|
6
|
+
set_user_config_value("telemetry", serde_json::Value::Bool(true));
|
|
7
|
+
|
|
8
|
+
let logger = Logger::new();
|
|
9
|
+
logger.log_message(LogLevel::Info, "Telemetry has been enabled.");
|
|
10
|
+
|
|
11
|
+
Ok(())
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
#[cfg(feature = "cli")]
|
|
15
|
+
pub async fn handle_telemetry_disable_command() -> Result<(), String> {
|
|
16
|
+
set_user_config_value("telemetry", serde_json::Value::Bool(false));
|
|
17
|
+
|
|
18
|
+
let logger = Logger::new();
|
|
19
|
+
logger.log_message(LogLevel::Info, "Telemetry has been disabled.");
|
|
20
|
+
|
|
21
|
+
Ok(())
|
|
22
|
+
}
|
|
@@ -1,80 +1,80 @@
|
|
|
1
|
-
use crate::config::settings::get_user_config;
|
|
2
|
-
use devalang_types::{
|
|
3
|
-
TelemetryErrorLevel as SharedTelemetryErrorLevel, TelemetryEvent as SharedTelemetryEvent,
|
|
4
|
-
};
|
|
5
|
-
use uuid::Uuid;
|
|
6
|
-
|
|
7
|
-
pub type TelemetryEvent = SharedTelemetryEvent;
|
|
8
|
-
pub type TelemetryErrorLevel = SharedTelemetryErrorLevel;
|
|
9
|
-
|
|
10
|
-
pub trait TelemetryEventExt {
|
|
11
|
-
fn set_timestamp(&mut self, timestamp: String);
|
|
12
|
-
fn set_duration(&mut self, duration: u64);
|
|
13
|
-
fn set_success(&mut self, success: bool);
|
|
14
|
-
fn set_error(
|
|
15
|
-
&mut self,
|
|
16
|
-
level: TelemetryErrorLevel,
|
|
17
|
-
message: Option<String>,
|
|
18
|
-
exit_code: Option<i32>,
|
|
19
|
-
);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
impl TelemetryEventExt for SharedTelemetryEvent {
|
|
23
|
-
fn set_timestamp(&mut self, timestamp: String) {
|
|
24
|
-
self.timestamp = timestamp;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
fn set_duration(&mut self, duration: u64) {
|
|
28
|
-
self.duration = duration;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
fn set_success(&mut self, success: bool) {
|
|
32
|
-
self.success = success;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
fn set_error(
|
|
36
|
-
&mut self,
|
|
37
|
-
level: TelemetryErrorLevel,
|
|
38
|
-
message: Option<String>,
|
|
39
|
-
exit_code: Option<i32>,
|
|
40
|
-
) {
|
|
41
|
-
self.error_level = level;
|
|
42
|
-
self.error_message = message;
|
|
43
|
-
self.exit_code = exit_code;
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
pub struct TelemetryEventCreator {
|
|
48
|
-
pub events: Vec<TelemetryEvent>,
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
impl TelemetryEventCreator {
|
|
52
|
-
pub fn new() -> Self {
|
|
53
|
-
TelemetryEventCreator { events: Vec::new() }
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
pub fn create_event(&mut self, event: TelemetryEvent) {
|
|
57
|
-
self.events.push(event.clone());
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
pub fn get_base_event(&self) -> TelemetryEvent {
|
|
61
|
-
let uuid = match get_user_config() {
|
|
62
|
-
Some(cfg) if !cfg.telemetry.uuid.is_empty() => cfg.telemetry.uuid.clone(),
|
|
63
|
-
_ => Uuid::new_v4().to_string(),
|
|
64
|
-
};
|
|
65
|
-
|
|
66
|
-
TelemetryEvent {
|
|
67
|
-
uuid,
|
|
68
|
-
cli_version: env!("CARGO_PKG_VERSION").to_string(),
|
|
69
|
-
os: std::env::consts::OS.to_string(),
|
|
70
|
-
command: std::env::args().collect::<Vec<_>>(),
|
|
71
|
-
project_info: None,
|
|
72
|
-
error_level: TelemetryErrorLevel::None,
|
|
73
|
-
error_message: None,
|
|
74
|
-
exit_code: None,
|
|
75
|
-
timestamp: chrono::Utc::now().to_string(),
|
|
76
|
-
duration: 0,
|
|
77
|
-
success: true,
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
}
|
|
1
|
+
use crate::config::settings::get_user_config;
|
|
2
|
+
use devalang_types::{
|
|
3
|
+
TelemetryErrorLevel as SharedTelemetryErrorLevel, TelemetryEvent as SharedTelemetryEvent,
|
|
4
|
+
};
|
|
5
|
+
use uuid::Uuid;
|
|
6
|
+
|
|
7
|
+
pub type TelemetryEvent = SharedTelemetryEvent;
|
|
8
|
+
pub type TelemetryErrorLevel = SharedTelemetryErrorLevel;
|
|
9
|
+
|
|
10
|
+
pub trait TelemetryEventExt {
|
|
11
|
+
fn set_timestamp(&mut self, timestamp: String);
|
|
12
|
+
fn set_duration(&mut self, duration: u64);
|
|
13
|
+
fn set_success(&mut self, success: bool);
|
|
14
|
+
fn set_error(
|
|
15
|
+
&mut self,
|
|
16
|
+
level: TelemetryErrorLevel,
|
|
17
|
+
message: Option<String>,
|
|
18
|
+
exit_code: Option<i32>,
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
impl TelemetryEventExt for SharedTelemetryEvent {
|
|
23
|
+
fn set_timestamp(&mut self, timestamp: String) {
|
|
24
|
+
self.timestamp = timestamp;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
fn set_duration(&mut self, duration: u64) {
|
|
28
|
+
self.duration = duration;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
fn set_success(&mut self, success: bool) {
|
|
32
|
+
self.success = success;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
fn set_error(
|
|
36
|
+
&mut self,
|
|
37
|
+
level: TelemetryErrorLevel,
|
|
38
|
+
message: Option<String>,
|
|
39
|
+
exit_code: Option<i32>,
|
|
40
|
+
) {
|
|
41
|
+
self.error_level = level;
|
|
42
|
+
self.error_message = message;
|
|
43
|
+
self.exit_code = exit_code;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
pub struct TelemetryEventCreator {
|
|
48
|
+
pub events: Vec<TelemetryEvent>,
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
impl TelemetryEventCreator {
|
|
52
|
+
pub fn new() -> Self {
|
|
53
|
+
TelemetryEventCreator { events: Vec::new() }
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
pub fn create_event(&mut self, event: TelemetryEvent) {
|
|
57
|
+
self.events.push(event.clone());
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
pub fn get_base_event(&self) -> TelemetryEvent {
|
|
61
|
+
let uuid = match get_user_config() {
|
|
62
|
+
Some(cfg) if !cfg.telemetry.uuid.is_empty() => cfg.telemetry.uuid.clone(),
|
|
63
|
+
_ => Uuid::new_v4().to_string(),
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
TelemetryEvent {
|
|
67
|
+
uuid,
|
|
68
|
+
cli_version: env!("CARGO_PKG_VERSION").to_string(),
|
|
69
|
+
os: std::env::consts::OS.to_string(),
|
|
70
|
+
command: std::env::args().collect::<Vec<_>>(),
|
|
71
|
+
project_info: None,
|
|
72
|
+
error_level: TelemetryErrorLevel::None,
|
|
73
|
+
error_message: None,
|
|
74
|
+
exit_code: None,
|
|
75
|
+
timestamp: chrono::Utc::now().to_string(),
|
|
76
|
+
duration: 0,
|
|
77
|
+
success: true,
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
pub mod commands;
|
|
2
|
-
pub mod event_creator;
|
|
3
|
-
pub mod send;
|
|
1
|
+
pub mod commands;
|
|
2
|
+
pub mod event_creator;
|
|
3
|
+
pub mod send;
|
|
@@ -1,51 +1,51 @@
|
|
|
1
|
-
use std::time::Duration;
|
|
2
|
-
|
|
3
|
-
use crate::{config::settings::get_user_config, web::api::get_api_url};
|
|
4
|
-
use devalang_types::{TelemetryEvent, TelemetrySendError};
|
|
5
|
-
|
|
6
|
-
pub async fn send_telemetry_event(event: &TelemetryEvent) -> Result<(), TelemetrySendError> {
|
|
7
|
-
if let Some(cfg) = get_user_config() {
|
|
8
|
-
if cfg.telemetry.enabled == false {
|
|
9
|
-
return Ok(());
|
|
10
|
-
}
|
|
11
|
-
} else {
|
|
12
|
-
return Ok(());
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
let telemetry_url = format!("{}/v1/telemetry/send", get_api_url());
|
|
16
|
-
let client = reqwest::Client::builder()
|
|
17
|
-
.timeout(Duration::from_secs(5))
|
|
18
|
-
.build()
|
|
19
|
-
.map_err(|e| TelemetrySendError::Http(format!("client build error: {}", e)))?;
|
|
20
|
-
|
|
21
|
-
let mut last_err: Option<String> = None;
|
|
22
|
-
for (i, delay_ms) in [0u64, 250, 500, 1000].iter().enumerate() {
|
|
23
|
-
if *delay_ms > 0 {
|
|
24
|
-
tokio::time::sleep(Duration::from_millis(*delay_ms)).await;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
let res = client
|
|
28
|
-
.post(telemetry_url.clone())
|
|
29
|
-
.json(event)
|
|
30
|
-
.send()
|
|
31
|
-
.await
|
|
32
|
-
.and_then(|r| r.error_for_status());
|
|
33
|
-
|
|
34
|
-
match res {
|
|
35
|
-
Ok(_) => {
|
|
36
|
-
return Ok(());
|
|
37
|
-
}
|
|
38
|
-
Err(err) => {
|
|
39
|
-
last_err = Some(err.to_string());
|
|
40
|
-
|
|
41
|
-
if i == 3 {
|
|
42
|
-
break;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
Err(TelemetrySendError::Http(
|
|
49
|
-
last_err.unwrap_or_else(|| "unknown error".to_string()),
|
|
50
|
-
))
|
|
51
|
-
}
|
|
1
|
+
use std::time::Duration;
|
|
2
|
+
|
|
3
|
+
use crate::{config::settings::get_user_config, web::api::get_api_url};
|
|
4
|
+
use devalang_types::{TelemetryEvent, TelemetrySendError};
|
|
5
|
+
|
|
6
|
+
pub async fn send_telemetry_event(event: &TelemetryEvent) -> Result<(), TelemetrySendError> {
|
|
7
|
+
if let Some(cfg) = get_user_config() {
|
|
8
|
+
if cfg.telemetry.enabled == false {
|
|
9
|
+
return Ok(());
|
|
10
|
+
}
|
|
11
|
+
} else {
|
|
12
|
+
return Ok(());
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
let telemetry_url = format!("{}/v1/telemetry/send", get_api_url());
|
|
16
|
+
let client = reqwest::Client::builder()
|
|
17
|
+
.timeout(Duration::from_secs(5))
|
|
18
|
+
.build()
|
|
19
|
+
.map_err(|e| TelemetrySendError::Http(format!("client build error: {}", e)))?;
|
|
20
|
+
|
|
21
|
+
let mut last_err: Option<String> = None;
|
|
22
|
+
for (i, delay_ms) in [0u64, 250, 500, 1000].iter().enumerate() {
|
|
23
|
+
if *delay_ms > 0 {
|
|
24
|
+
tokio::time::sleep(Duration::from_millis(*delay_ms)).await;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
let res = client
|
|
28
|
+
.post(telemetry_url.clone())
|
|
29
|
+
.json(event)
|
|
30
|
+
.send()
|
|
31
|
+
.await
|
|
32
|
+
.and_then(|r| r.error_for_status());
|
|
33
|
+
|
|
34
|
+
match res {
|
|
35
|
+
Ok(_) => {
|
|
36
|
+
return Ok(());
|
|
37
|
+
}
|
|
38
|
+
Err(err) => {
|
|
39
|
+
last_err = Some(err.to_string());
|
|
40
|
+
|
|
41
|
+
if i == 3 {
|
|
42
|
+
break;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
Err(TelemetrySendError::Http(
|
|
49
|
+
last_err.unwrap_or_else(|| "unknown error".to_string()),
|
|
50
|
+
))
|
|
51
|
+
}
|
|
@@ -1,69 +1,69 @@
|
|
|
1
|
-
use devalang_utils::file::format_file_size;
|
|
2
|
-
use include_dir::{Dir, DirEntry, include_dir};
|
|
3
|
-
|
|
4
|
-
static TEMPLATES_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/templates");
|
|
5
|
-
|
|
6
|
-
#[cfg(feature = "cli")]
|
|
7
|
-
pub fn handle_template_list_command() {
|
|
8
|
-
let available_templates = get_available_templates();
|
|
9
|
-
|
|
10
|
-
println!("📦 Available templates ({}) :\n", available_templates.len());
|
|
11
|
-
|
|
12
|
-
for dir in available_templates {
|
|
13
|
-
println!("• {}", dir);
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
println!("\nUsage : devalang init --name <project-name> --template <template-name>");
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
#[cfg(feature = "cli")]
|
|
20
|
-
pub fn handle_template_info_command(name: String) {
|
|
21
|
-
let template_dir = TEMPLATES_DIR.get_dir(name.clone()).unwrap_or_else(|| {
|
|
22
|
-
println!("❌ The template '{}' is not found.", name);
|
|
23
|
-
|
|
24
|
-
std::process::exit(1);
|
|
25
|
-
});
|
|
26
|
-
|
|
27
|
-
let mut file_count = 0;
|
|
28
|
-
let mut dir_count = 0;
|
|
29
|
-
let mut total_size: u64 = 0;
|
|
30
|
-
|
|
31
|
-
fn walk(dir: &Dir, file_count: &mut u32, dir_count: &mut u32, total_size: &mut u64) {
|
|
32
|
-
for entry in dir.entries() {
|
|
33
|
-
match entry {
|
|
34
|
-
DirEntry::File(file) => {
|
|
35
|
-
*file_count += 1;
|
|
36
|
-
*total_size += file.contents().len() as u64;
|
|
37
|
-
}
|
|
38
|
-
DirEntry::Dir(subdir) => {
|
|
39
|
-
*dir_count += 1;
|
|
40
|
-
walk(subdir, file_count, dir_count, total_size);
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
walk(
|
|
47
|
-
template_dir,
|
|
48
|
-
&mut file_count,
|
|
49
|
-
&mut dir_count,
|
|
50
|
-
&mut total_size,
|
|
51
|
-
);
|
|
52
|
-
|
|
53
|
-
println!("📦 Template : {}", name);
|
|
54
|
-
println!("📂 Content : {file_count} file(s), {dir_count} folder(s)");
|
|
55
|
-
println!("💾 Size : {}", format_file_size(total_size));
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
pub fn get_available_templates() -> Vec<String> {
|
|
59
|
-
TEMPLATES_DIR
|
|
60
|
-
.dirs()
|
|
61
|
-
.map(|dir| {
|
|
62
|
-
dir.path()
|
|
63
|
-
.file_name()
|
|
64
|
-
.unwrap()
|
|
65
|
-
.to_string_lossy()
|
|
66
|
-
.to_string()
|
|
67
|
-
})
|
|
68
|
-
.collect()
|
|
69
|
-
}
|
|
1
|
+
use devalang_utils::file::format_file_size;
|
|
2
|
+
use include_dir::{Dir, DirEntry, include_dir};
|
|
3
|
+
|
|
4
|
+
static TEMPLATES_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/templates");
|
|
5
|
+
|
|
6
|
+
#[cfg(feature = "cli")]
|
|
7
|
+
pub fn handle_template_list_command() {
|
|
8
|
+
let available_templates = get_available_templates();
|
|
9
|
+
|
|
10
|
+
println!("📦 Available templates ({}) :\n", available_templates.len());
|
|
11
|
+
|
|
12
|
+
for dir in available_templates {
|
|
13
|
+
println!("• {}", dir);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
println!("\nUsage : devalang init --name <project-name> --template <template-name>");
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
#[cfg(feature = "cli")]
|
|
20
|
+
pub fn handle_template_info_command(name: String) {
|
|
21
|
+
let template_dir = TEMPLATES_DIR.get_dir(name.clone()).unwrap_or_else(|| {
|
|
22
|
+
println!("❌ The template '{}' is not found.", name);
|
|
23
|
+
|
|
24
|
+
std::process::exit(1);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
let mut file_count = 0;
|
|
28
|
+
let mut dir_count = 0;
|
|
29
|
+
let mut total_size: u64 = 0;
|
|
30
|
+
|
|
31
|
+
fn walk(dir: &Dir, file_count: &mut u32, dir_count: &mut u32, total_size: &mut u64) {
|
|
32
|
+
for entry in dir.entries() {
|
|
33
|
+
match entry {
|
|
34
|
+
DirEntry::File(file) => {
|
|
35
|
+
*file_count += 1;
|
|
36
|
+
*total_size += file.contents().len() as u64;
|
|
37
|
+
}
|
|
38
|
+
DirEntry::Dir(subdir) => {
|
|
39
|
+
*dir_count += 1;
|
|
40
|
+
walk(subdir, file_count, dir_count, total_size);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
walk(
|
|
47
|
+
template_dir,
|
|
48
|
+
&mut file_count,
|
|
49
|
+
&mut dir_count,
|
|
50
|
+
&mut total_size,
|
|
51
|
+
);
|
|
52
|
+
|
|
53
|
+
println!("📦 Template : {}", name);
|
|
54
|
+
println!("📂 Content : {file_count} file(s), {dir_count} folder(s)");
|
|
55
|
+
println!("💾 Size : {}", format_file_size(total_size));
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
pub fn get_available_templates() -> Vec<String> {
|
|
59
|
+
TEMPLATES_DIR
|
|
60
|
+
.dirs()
|
|
61
|
+
.map(|dir| {
|
|
62
|
+
dir.path()
|
|
63
|
+
.file_name()
|
|
64
|
+
.unwrap()
|
|
65
|
+
.to_string_lossy()
|
|
66
|
+
.to_string()
|
|
67
|
+
})
|
|
68
|
+
.collect()
|
|
69
|
+
}
|