Skip to content
Merged
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
10 changes: 8 additions & 2 deletions packages/config/src/validators/is-ip-or-url.validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { type ValidationOptions, isIP, isURL, registerDecorator } from "class-va
* config properties that represent server hostnames or addresses.
*
* @param validationOptions - Optional class-validator validation options.
* @param isIPOptions - Optional options for `isIP` validation.
* @param isURLOptions - Optional options for `isURL` validation.
*
* @example
* ```ts
Expand All @@ -19,7 +21,11 @@ import { type ValidationOptions, isIP, isURL, registerDecorator } from "class-va
* }
* ```
*/
export const IsIpOrURL = (validationOptions?: ValidationOptions) => {
export const IsIpOrURL = (
validationOptions?: ValidationOptions,
isIPOptions?: Parameters<typeof isIP>[1],
isURLOptions?: Parameters<typeof isURL>[1],
) => {
return (object: object, propertyName: string) => {
registerDecorator({
target: object.constructor,
Expand All @@ -28,7 +34,7 @@ export const IsIpOrURL = (validationOptions?: ValidationOptions) => {
constraints: [],
validator: {
validate(value: string) {
return isIP(value) || isURL(value);
return isIP(value, isIPOptions) || isURL(value, isURLOptions);
},
defaultMessage() {
return `$value must be a valid IP address or URL`;
Expand Down
2 changes: 1 addition & 1 deletion packages/network-client/src/config.client.network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class ClientConfigNetwork {

/** Hostname or IP address of the game server. */
@Expose()
@IsIpOrURL()
@IsIpOrURL(undefined, undefined, { protocols: ["ws", "wss", "http", "https"] })
SERVER_ADDRESS!: string;

/**
Expand Down
Loading