Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/native-node-tty.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@cloudflare/unenv-preset": minor
---

Add support for native `node:tty` module when the `enable_nodejs_tty_module` and `experimental` compatibility flags are enabled.
39 changes: 39 additions & 0 deletions packages/unenv-preset/src/preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export function getCloudflarePreset({
const sqliteOverrides = getSqliteOverrides(compat);
const dgramOverrides = getDgramOverrides(compat);
const streamWrapOverrides = getStreamWrapOverrides(compat);
const ttyOverrides = getTtyOverrides(compat);

// "dynamic" as they depend on the compatibility date and flags
const dynamicNativeModules = [
Expand All @@ -102,6 +103,7 @@ export function getCloudflarePreset({
...sqliteOverrides.nativeModules,
...dgramOverrides.nativeModules,
...streamWrapOverrides.nativeModules,
...ttyOverrides.nativeModules,
];

// "dynamic" as they depend on the compatibility date and flags
Expand All @@ -122,6 +124,7 @@ export function getCloudflarePreset({
...sqliteOverrides.hybridModules,
...dgramOverrides.hybridModules,
...streamWrapOverrides.hybridModules,
...ttyOverrides.hybridModules,
];

return {
Expand Down Expand Up @@ -752,3 +755,39 @@ function getStreamWrapOverrides({
hybridModules: [],
};
}

/**
* Returns the overrides for `node:tty` (unenv or workerd)
*
* The native tty implementation:
* - is experimental and has no default enable date
* - can be enabled with the "enable_nodejs_tty_module" flag
* - can be disabled with the "disable_nodejs_tty_module" flag
*/
function getTtyOverrides({
compatibilityFlags,
}: {
compatibilityDate: string;
compatibilityFlags: string[];
}): { nativeModules: string[]; hybridModules: string[] } {
const disabledByFlag = compatibilityFlags.includes(
"disable_nodejs_tty_module"
);

const enabledByFlag =
compatibilityFlags.includes("enable_nodejs_tty_module") &&
compatibilityFlags.includes("experimental");

const enabled = enabledByFlag && !disabledByFlag;

// When enabled, use the native `tty` module from workerd
return enabled
? {
nativeModules: ["tty"],
hybridModules: [],
}
: {
nativeModules: [],
hybridModules: [],
};
}
21 changes: 21 additions & 0 deletions packages/wrangler/e2e/unenv-preset/preset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,27 @@ const localTestConfigs: TestConfig[] = [
},
},
],
// node:tty (experimental, no default enable date)
[
// TODO: add test for disabled by date (no date defined yet)
// TODO: add test for enabled by date (no date defined yet)
{
name: "tty enabled by flag",
compatibilityDate: "2024-09-23",
compatibilityFlags: ["enable_nodejs_tty_module", "experimental"],
expectRuntimeFlags: {
enable_nodejs_tty_module: true,
},
},
{
name: "tty disabled by flag",
compatibilityDate: "2024-09-23",
compatibilityFlags: ["disable_nodejs_tty_module", "experimental"],
expectRuntimeFlags: {
enable_nodejs_tty_module: false,
},
},
],
].flat() as TestConfig[];

describe.each(localTestConfigs)(
Expand Down
35 changes: 35 additions & 0 deletions packages/wrangler/e2e/unenv-preset/worker/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,41 @@ export const WorkerdTests: Record<string, () => void> = {
// `JSStreamSocket` is the default export of `node:_stream_wrap`
assertTypeOf(streamWrap, "default", "function");
},

async testTty() {
const tty = await import("node:tty");

// Common exports (both unenv stub and native workerd)
assertTypeOfProperties(tty, {
isatty: "function",
ReadStream: "function",
WriteStream: "function",
});

assertTypeOfProperties(tty.default, {
isatty: "function",
ReadStream: "function",
WriteStream: "function",
});

// isatty should return false (both unenv and workerd)
assert.strictEqual(tty.isatty(0), false);
assert.strictEqual(tty.isatty(1), false);
assert.strictEqual(tty.isatty(2), false);

// Native workerd throws when calling ReadStream/WriteStream constructors
// unenv stub does not throw - it creates stub objects
if (getRuntimeFlagValue("enable_nodejs_tty_module")) {
assert.throws(
() => new (tty.ReadStream as any)(0),
/ERR_METHOD_NOT_IMPLEMENTED/
);
assert.throws(
() => new (tty.WriteStream as any)(1),
/ERR_METHOD_NOT_IMPLEMENTED/
);
}
},
};

/**
Expand Down
Loading