clearer naming for tls cli binding logic

Author: alii

src/bun.js/node/node_tls_binding.zig

@@ -3,16 +3,16 @@ const std = @import("std");
 const bun = @import("bun");
 const JSC = bun.JSC;
 
-pub fn getDefaultMinTLSVersion(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) bun.JSError!JSC.JSValue {
-    if (bun.tls.min_tls_version) |version| {
+pub fn getDefaultMinTLSVersionFromCLIFlag(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) bun.JSError!JSC.JSValue {
+    if (bun.tls.min_tls_version_from_cli_flag) |version| {
         return JSC.JSValue.jsNumber(version);
     }
 
     return JSC.JSValue.jsNull();
 }
 
-pub fn getDefaultMaxTLSVersion(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) bun.JSError!JSC.JSValue {
-    if (bun.tls.max_tls_version) |version| {
+pub fn getDefaultMaxTLSVersionFromCLIFlag(_: *JSC.JSGlobalObject, _: *JSC.CallFrame) bun.JSError!JSC.JSValue {
+    if (bun.tls.max_tls_version_from_cli_flag) |version| {
         return JSC.JSValue.jsNumber(version);
     }
 

src/cli.zig

@@ -761,15 +761,15 @@ pub const Arguments = struct {
 
             // if (args.flag("--tls-max-v1.0")) bun.tls.max_tls_version = 0x0301;
             // if (args.flag("--tls-max-v1.1")) bun.tls.max_tls_version = 0x0302;
-            if (args.flag("--tls-max-v1.2")) bun.tls.max_tls_version = 0x0303;
-            if (args.flag("--tls-max-v1.3")) bun.tls.max_tls_version = 0x0304;
+            if (args.flag("--tls-max-v1.2")) bun.tls.max_tls_version_from_cli_flag = 0x0303;
+            if (args.flag("--tls-max-v1.3")) bun.tls.max_tls_version_from_cli_flag = 0x0304;
 
-            if (args.flag("--tls-min-v1.3")) bun.tls.min_tls_version = 0x0304;
-            if (args.flag("--tls-min-v1.2")) bun.tls.min_tls_version = 0x0303;
-            if (args.flag("--tls-min-v1.1")) bun.tls.min_tls_version = 0x0302;
-            if (args.flag("--tls-min-v1.0")) bun.tls.min_tls_version = 0x0301;
+            if (args.flag("--tls-min-v1.3")) bun.tls.min_tls_version_from_cli_flag = 0x0304;
+            if (args.flag("--tls-min-v1.2")) bun.tls.min_tls_version_from_cli_flag = 0x0303;
+            if (args.flag("--tls-min-v1.1")) bun.tls.min_tls_version_from_cli_flag = 0x0302;
+            if (args.flag("--tls-min-v1.0")) bun.tls.min_tls_version_from_cli_flag = 0x0301;
 
-            if (bun.tls.min_tls_version != null and bun.tls.max_tls_version != null) {
+            if (bun.tls.min_tls_version_from_cli_flag != null and bun.tls.max_tls_version_from_cli_flag != null) {
                 Output.errGeneric("either --tls-min-v1.x or --tls-max-v1.x can be used, not both", .{});
                 Global.exit(1);
             }

src/js/node/tls.ts

@@ -15,15 +15,15 @@ const { rootCertificates, canonicalizeIP } = $cpp("NodeTLS.cpp", "createNodeTLSB
 
 type TLSSecureVersionNumber = SecureVersion extends `TLSv${infer N extends number}` ? N : never;
 
-const getMinTLSVersion = $newZigFunction(
+const getDefaultMinTLSVersionFromCLIFlag = $newZigFunction(
   "node_tls_binding.zig",
-  "getDefaultMinTLSVersion",
+  "getDefaultMinTLSVersionFromCLIFlag",
   0,
 ) as () => TLSSecureVersionNumber | null;
 
-const getMaxTLSVersion = $newZigFunction(
+const getDefaultMaxTLSVersionFromCLIFlag = $newZigFunction(
   "node_tls_binding.zig",
-  "getDefaultMaxTLSVersion",
+  "getDefaultMaxTLSVersionFromCLIFlag",
   0,
 ) as () => TLSSecureVersionNumber | null;
 
@@ -845,8 +845,8 @@ function getTlsVersionOrDefault(version: number | null, fallback: SecureVersion)
   return asString;
 }
 
-const DEFAULT_MIN_VERSION: SecureVersion = getTlsVersionOrDefault(getMinTLSVersion(), "TLSv1.2");
-const DEFAULT_MAX_VERSION: SecureVersion = getTlsVersionOrDefault(getMaxTLSVersion(), "TLSv1.3");
+const DEFAULT_MIN_VERSION: SecureVersion = getTlsVersionOrDefault(getDefaultMinTLSVersionFromCLIFlag(), "TLSv1.2");
+const DEFAULT_MAX_VERSION: SecureVersion = getTlsVersionOrDefault(getDefaultMaxTLSVersionFromCLIFlag(), "TLSv1.3");
 
 function normalizeConnectArgs(listArgs) {
   const args = net._normalizeArgs(listArgs);

src/tls.zig

@@ -8,5 +8,5 @@ const bun = @import("bun");
 // A null value means no CLI flag was provided, and the *default* defaults
 // are defined in src/js/node/tls.ts
 
-pub var min_tls_version: ?u16 = null;
-pub var max_tls_version: ?u16 = null;
+pub var min_tls_version_from_cli_flag: ?u16 = null;
+pub var max_tls_version_from_cli_flag: ?u16 = null;