Skip to content

Commit c0450ef

Browse files
committed
Merge branch 'main' of https://github.com/metatypedev/metatype into upload/s3
2 parents 1860d8f + 24a1993 commit c0450ef

37 files changed

+1081
-1028
lines changed

.ghjk/deno.lock

Lines changed: 2 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.ghjk/lock.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"portRef": "[email protected]",
8585
"pluginRepo": "https://github.com/asdf-community/asdf-cmake"
8686
},
87+
"468769528cbf87576285bfcd000271d6398bf3c2b20083d90105d083d61854ba": {
88+
"version": "2.40.1",
89+
"depConfigs": {},
90+
"portRef": "[email protected]"
91+
},
8792
"402fae54fb94ffdba9cd2617602c7b33c55002275f3c3bb588615b01ff0c3c26": {
8893
"version": "v1.6.4",
8994
"depConfigs": {},

libs/deno/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ pub async fn run(
5858
permissions: PermissionsOptions,
5959
custom_extensions: Arc<worker::CustomExtensionsCb>,
6060
) -> anyhow::Result<()> {
61+
deno::util::v8::init_v8_flags(&[], &[], deno::util::v8::get_v8_flags_from_env());
62+
6163
deno_runtime::permissions::set_prompt_callbacks(
6264
Box::new(util::draw_thread::DrawThread::hide),
6365
Box::new(util::draw_thread::DrawThread::show),
@@ -137,6 +139,8 @@ pub async fn test(
137139
) -> anyhow::Result<()> {
138140
use deno::tools::test::*;
139141

142+
deno::util::v8::init_v8_flags(&[], &[], deno::util::v8::get_v8_flags_from_env());
143+
140144
deno_runtime::permissions::set_prompt_callbacks(
141145
Box::new(util::draw_thread::DrawThread::hide),
142146
Box::new(util::draw_thread::DrawThread::show),
@@ -302,6 +306,7 @@ pub async fn bench(
302306
) -> anyhow::Result<()> {
303307
use deno::tools::bench::*;
304308
use deno::tools::test::TestFilter;
309+
deno::util::v8::init_v8_flags(&[], &[], deno::util::v8::get_v8_flags_from_env());
305310

306311
deno_runtime::permissions::set_prompt_callbacks(
307312
Box::new(util::draw_thread::DrawThread::hide),

meta-cli/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ fn main() -> Result<()> {
5252
Err(e) => e.exit(),
5353
};
5454

55+
log::set_max_level(args.verbose.log_level_filter());
56+
5557
if args.version {
5658
println!("meta {}", build::PKG_VERSION);
5759
return Ok(());

typegate/deno.lock

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

typegate/src/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const schema = {
2929
return bytes;
3030
}),
3131
timer_max_timeout_ms: z.coerce.number().positive().max(60000),
32-
timer_destroy_ressources: z.boolean(),
32+
timer_destroy_resources: z.boolean(),
3333
timer_policy_eval_retries: z.number().nonnegative().max(5),
3434
tg_admin_password: z.string(),
3535
tmp_dir: z.string(),
@@ -74,7 +74,7 @@ const config = await configOrExit([
7474
trust_header_ip: "X-Forwarded-For",
7575
tg_port: "7890",
7676
timer_max_timeout_ms: 3000,
77-
timer_destroy_ressources: true,
77+
timer_destroy_resources: true,
7878
timer_policy_eval_retries: 1,
7979
redis_url_queue_expire_sec: 60 * 5, // 5 minutes
8080
},

typegate/src/runtimes/patterns/messenger/async_messenger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class AsyncMessenger<Broker, M, A> {
8585
}
8686
}
8787

88-
if (shouldStop && config.timer_destroy_ressources) {
88+
if (shouldStop && config.timer_destroy_resources) {
8989
this.#stop(this.broker);
9090
logger.info("reset broker after timeout");
9191
this.broker = this.#start(this.receive.bind(this));

0 commit comments

Comments
 (0)