Skip to content

Commit c1c10ac

Browse files
committed
remove c++ based node internal dns module
1 parent e3e9c1c commit c1c10ac

File tree

6 files changed

+4
-327
lines changed

6 files changed

+4
-327
lines changed

src/rust/dns/BUILD.bazel

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/rust/dns/lib.rs

Lines changed: 0 additions & 208 deletions
This file was deleted.

src/workerd/api/node/BUILD.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,20 @@ wd_cc_library(
6161
name = "node-core",
6262
srcs = [
6363
"buffer.c++",
64-
"dns.c++",
6564
"i18n.c++",
6665
"sqlite.c++",
6766
"url.c++",
6867
],
6968
hdrs = [
7069
"buffer.h",
7170
"buffer-string-search.h",
72-
"dns.h",
7371
"i18n.h",
7472
"node-version.h",
7573
"sqlite.h",
7674
"url.h",
7775
],
7876
implementation_deps = [
7977
"//src/rust/cxx-integration",
80-
"//src/rust/dns",
8178
"//src/rust/net",
8279
"@ada-url",
8380
"@nbytes",

src/workerd/api/node/dns.c++

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/workerd/api/node/dns.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/workerd/api/node/node.h

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <workerd/api/node/async-hooks.h>
88
#include <workerd/api/node/buffer.h>
9-
#include <workerd/api/node/dns.h>
109
#include <workerd/api/node/module.h>
1110
#include <workerd/api/node/process.h>
1211
#include <workerd/api/node/sqlite.h>
@@ -19,7 +18,6 @@
1918
#include <workerd/jsg/url.h>
2019
#include <workerd/rust/api/lib.rs.h>
2120
#include <workerd/rust/jsg/jsg.h>
22-
#include <workerd/util/autogate.h>
2321

2422
#include <node/node.capnp.h>
2523

@@ -88,12 +86,6 @@ void registerNodeJsCompatModules(Registry& registry, auto featureFlags) {
8886

8987
#undef V
9088

91-
// Only register C++ DnsUtil if Rust implementation is not enabled
92-
if (!util::Autogate::isEnabled(util::AutogateKey::RUST_BACKED_NODE_DNS)) {
93-
registry.template addBuiltinModule<DnsUtil>(
94-
"node-internal:dns", workerd::jsg::ModuleRegistry::Type::INTERNAL);
95-
}
96-
9789
bool nodeJsCompatEnabled = isNodeJsCompatEnabled(featureFlags);
9890

9991
registry.addBuiltinBundleFiltered(NODE_BUNDLE, [&](jsg::Module::Reader module) {
@@ -216,10 +208,8 @@ void registerNodeJsCompatModules(Registry& registry, auto featureFlags) {
216208
}
217209
}
218210

219-
if (util::Autogate::isEnabled(util::AutogateKey::RUST_BACKED_NODE_DNS)) {
220-
::workerd::rust::jsg::RustModuleRegistry r(registry);
221-
::workerd::rust::api::register_nodejs_modules(r);
222-
}
211+
::workerd::rust::jsg::RustModuleRegistry r(registry);
212+
::workerd::rust::api::register_nodejs_modules(r);
223213
}
224214

225215
template <class TypeWrapper>
@@ -234,11 +224,6 @@ kj::Own<jsg::modules::ModuleBundle> getInternalNodeJsCompatModuleBundle(auto fea
234224
NODEJS_MODULES_EXPERIMENTAL(V)
235225
}
236226
#undef V
237-
// Only register C++ DnsUtil if Rust implementation is not enabled
238-
if (!util::Autogate::isEnabled(util::AutogateKey::RUST_BACKED_NODE_DNS)) {
239-
static const auto kDnsUtilSpecifier = "node-internal:dns"_url;
240-
builder.addObject<DnsUtil, TypeWrapper>(kDnsUtilSpecifier);
241-
}
242227
jsg::modules::ModuleBundle::getBuiltInBundleFromCapnp(builder, NODE_BUNDLE);
243228
return builder.finish();
244229
}
@@ -272,5 +257,5 @@ kj::Own<jsg::modules::ModuleBundle> getExternalNodeJsCompatModuleBundle(auto fea
272257
EW_NODE_BUFFER_ISOLATE_TYPES, EW_NODE_CRYPTO_ISOLATE_TYPES, \
273258
EW_NODE_DIAGNOSTICCHANNEL_ISOLATE_TYPES, EW_NODE_ASYNCHOOKS_ISOLATE_TYPES, \
274259
EW_NODE_UTIL_ISOLATE_TYPES, EW_NODE_PROCESS_ISOLATE_TYPES, EW_NODE_ZLIB_ISOLATE_TYPES, \
275-
EW_NODE_URL_ISOLATE_TYPES, EW_NODE_MODULE_ISOLATE_TYPES, EW_NODE_DNS_ISOLATE_TYPES, \
276-
EW_NODE_TIMERS_ISOLATE_TYPES, EW_NODE_SQLITE_ISOLATE_TYPES
260+
EW_NODE_URL_ISOLATE_TYPES, EW_NODE_MODULE_ISOLATE_TYPES, EW_NODE_TIMERS_ISOLATE_TYPES, \
261+
EW_NODE_SQLITE_ISOLATE_TYPES

0 commit comments

Comments
 (0)