Merge pull request #30 from betwixt-labs/type-fix

fix: not checking for undefined & incorrect usage of coalescing operator

Author: andrewmd5

typescript/packages/cf-router/src/router.ts

@@ -122,7 +122,7 @@ export class TempoRouter<TEnv> extends BaseRouter<Request, TEnv, Response> {
 		const authHeader = request.headers.get('authorization');
 		if (authHeader !== null && this.authInterceptor !== undefined) {
 			const authContext = await this.authInterceptor.intercept(context, authHeader);
-			context.authContext = authContext;
+			if (authContext !== undefined) context.authContext = authContext;
 		}
 	}
 
@@ -411,7 +411,7 @@ export class TempoRouter<TEnv> extends BaseRouter<Request, TEnv, Response> {
 				status = e.status;
 				message = e.message;
 				// dont expose internal error messages to the client
-				if (e.status === TempoStatusCode.INTERNAL && this.transmitInternalErrors === false) {
+				if (e.status === TempoStatusCode.INTERNAL && this.transmitInternalErrors !== true) {
 					message = 'internal error';
 				}
 				// internal errors indicate transient problems or implementation bugs
@@ -420,7 +420,7 @@ export class TempoRouter<TEnv> extends BaseRouter<Request, TEnv, Response> {
 					? this.logger.critical(e.message, undefined, e)
 					: this.logger.error(message, undefined, e);
 			} else if (e instanceof Error) {
-				if (e.message.includes('D1_') && this.transmitInternalErrors === false) {
+				if (e.message.includes('D1_') && this.transmitInternalErrors !== true) {
 					message = 'internal error';
 					status = TempoStatusCode.INTERNAL;
 					this.logger.critical(e.message, undefined, e);

typescript/packages/client/src/channel.ts

@@ -258,21 +258,21 @@ export class TempoChannel extends BaseChannel {
 	protected constructor(target: URL, options: TempoChannelOptions) {
 		super(
 			target,
-			(options.logger ??= new ConsoleLogger('TempoChannel')),
-			(options.contentType ??= TempoChannel.defaultContentType),
+			options.logger ?? new ConsoleLogger('TempoChannel'),
+			options.contentType ?? TempoChannel.defaultContentType,
 		);
 		this.logger.debug('creating new TempoChannel');
 		this.isSecure = target.protocol === 'https:';
-		this.credential = options.credential ??= TempoChannel.defaultCredential;
+		this.credential = options.credential ?? TempoChannel.defaultCredential;
 		if (
 			!this.isSecure &&
 			!(this.credential instanceof InsecureChannelCredential) &&
 			options.unsafeUseInsecureChannelCallCredential !== true
 		) {
 			throw new Error('Cannot use secure credential with insecure channel');
 		}
-		this.maxReceiveMessageSize = options.maxReceiveMessageSize ??= TempoChannel.defaultMaxReceiveMessageSize;
-		this.credential = options.credential ??= TempoChannel.defaultCredential;
+		this.maxReceiveMessageSize = options.maxReceiveMessageSize ?? TempoChannel.defaultMaxReceiveMessageSize;
+		this.credential = options.credential ?? TempoChannel.defaultCredential;
 		this.userAgent = TempoUtil.buildUserAgent('javascript', TempoVersion, undefined, {
 			runtime: TempoUtil.getEnvironmentName(),
 		});

typescript/packages/node-http/src/router.ts

@@ -107,7 +107,7 @@ export class TempoRouter<TEnv> extends BaseRouter<IncomingMessage, TEnv, ServerR
 		const authHeader = request.headers.authorization;
 		if (authHeader !== undefined && this.authInterceptor !== undefined) {
 			const authContext = await this.authInterceptor.intercept(context, authHeader);
-			context.authContext = authContext;
+			if (authContext !== undefined) context.authContext = authContext;
 		}
 	}
 
@@ -390,13 +390,13 @@ export class TempoRouter<TEnv> extends BaseRouter<IncomingMessage, TEnv, ServerR
 				status = e.status;
 				message = e.message;
 				// dont expose internal error messages to the client
-				if (e.status === TempoStatusCode.INTERNAL && this.transmitInternalErrors === false) {
+				if (e.status === TempoStatusCode.INTERNAL && this.transmitInternalErrors !== true) {
 					message = 'internal error';
 				}
 				// internal errors indicate transient problems or implementation bugs
 				// so we log them as critical errors
 				e.status === TempoStatusCode.INTERNAL
-					? this.logger.critical(message, undefined, e)
+					? this.logger.critical(e.message, undefined, e)
 					: this.logger.error(message, undefined, e);
 			} else if (e instanceof Error) {
 				message = e.message;

typescript/packages/server/src/router.ts

@@ -101,16 +101,16 @@ export abstract class BaseRouter<TRequest, TEnvironment, TResponse> {
 		protected readonly configuration: TempoRouterConfiguration,
 		protected readonly authInterceptor?: AuthInterceptor,
 	) {
-		this.corsEnabled = configuration.enableCors ??= false;
+		this.corsEnabled = configuration.enableCors ?? false;
 		this.allowedCorsOrigins = configuration.allowedOrigins;
-		this.transmitInternalErrors = configuration.transmitInternalErrors ??= false;
+		this.transmitInternalErrors = configuration.transmitInternalErrors ?? false;
 		this.maxReceiveMessageSize =
 			configuration.maxReceiveMessageSize ?? TempoRouterConfiguration.defaultMaxReceiveMessageSize;
 		if (configuration.maxSendMessageSize !== undefined) {
 			this.maxSendMessageSize = configuration.maxSendMessageSize;
 		}
 		this.maxRetryAttempts = configuration.maxRetryAttempts ?? TempoRouterConfiguration.defaultMaxRetryAttempts;
-		this.exposeTempo = configuration.exposeTempo ??= true;
+		this.exposeTempo = configuration.exposeTempo ?? true;
 		this.registry.init();
 	}