summaryrefslogtreecommitdiff
path: root/ext/net/lib.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2023-03-09 10:56:19 -0400
committerGitHub <noreply@github.com>2023-03-09 14:56:19 +0000
commit8f207c0f3f3a43d77e0c88cfdc840b4b742b9708 (patch)
treea8699bca5ffffff03a9d72f1bed9208a349338ba /ext/net/lib.rs
parent99da8a69e7260b72e55d7214ec96f6ac5e759f35 (diff)
refactor: Split extension registration for runtime and snapshotting (#18095)
This commit splits "<ext_name>::init" functions into "init_ops" and "init_ops_and_esm". That way we don't have to construct list of ESM sources on each startup if we're running with a snapshot. In a follow up commit "deno_core" will be changed to not have a split between "extensions" and "extensions_with_js" - it will be embedders' responsibility to pass appropriately configured extensions. Prerequisite for https://github.com/denoland/deno/pull/18080
Diffstat (limited to 'ext/net/lib.rs')
-rw-r--r--ext/net/lib.rs62
1 files changed, 47 insertions, 15 deletions
diff --git a/ext/net/lib.rs b/ext/net/lib.rs
index 780cbceb5..4703b05cc 100644
--- a/ext/net/lib.rs
+++ b/ext/net/lib.rs
@@ -10,6 +10,7 @@ pub mod resolve_addr;
use deno_core::error::AnyError;
use deno_core::include_js_files;
use deno_core::Extension;
+use deno_core::ExtensionBuilder;
use deno_core::OpState;
use deno_tls::rustls::RootCertStore;
use std::cell::RefCell;
@@ -77,24 +78,55 @@ pub struct DefaultTlsOptions {
/// would override previously used alias.
pub struct UnsafelyIgnoreCertificateErrors(pub Option<Vec<String>>);
-pub fn init<P: NetPermissions + 'static>(
+fn ext() -> ExtensionBuilder {
+ Extension::builder_with_deps(env!("CARGO_PKG_NAME"), &["deno_web"])
+}
+
+fn ops<P: NetPermissions + 'static>(
+ ext: &mut ExtensionBuilder,
root_cert_store: Option<RootCertStore>,
unstable: bool,
unsafely_ignore_certificate_errors: Option<Vec<String>>,
-) -> Extension {
+) -> &mut ExtensionBuilder {
let mut ops = ops::init::<P>();
ops.extend(ops_tls::init::<P>());
- Extension::builder_with_deps(env!("CARGO_PKG_NAME"), &["deno_web"])
- .esm(include_js_files!("01_net.js", "02_tls.js",))
- .ops(ops)
- .state(move |state| {
- state.put(DefaultTlsOptions {
- root_cert_store: root_cert_store.clone(),
- });
- state.put(UnstableChecker { unstable });
- state.put(UnsafelyIgnoreCertificateErrors(
- unsafely_ignore_certificate_errors.clone(),
- ));
- })
- .build()
+
+ ext.ops(ops).state(move |state| {
+ state.put(DefaultTlsOptions {
+ root_cert_store: root_cert_store.clone(),
+ });
+ state.put(UnstableChecker { unstable });
+ state.put(UnsafelyIgnoreCertificateErrors(
+ unsafely_ignore_certificate_errors.clone(),
+ ));
+ })
+}
+
+pub fn init_ops_and_esm<P: NetPermissions + 'static>(
+ root_cert_store: Option<RootCertStore>,
+ unstable: bool,
+ unsafely_ignore_certificate_errors: Option<Vec<String>>,
+) -> Extension {
+ ops::<P>(
+ &mut ext(),
+ root_cert_store,
+ unstable,
+ unsafely_ignore_certificate_errors,
+ )
+ .esm(include_js_files!("01_net.js", "02_tls.js",))
+ .build()
+}
+
+pub fn init_ops<P: NetPermissions + 'static>(
+ root_cert_store: Option<RootCertStore>,
+ unstable: bool,
+ unsafely_ignore_certificate_errors: Option<Vec<String>>,
+) -> Extension {
+ ops::<P>(
+ &mut ext(),
+ root_cert_store,
+ unstable,
+ unsafely_ignore_certificate_errors,
+ )
+ .build()
}