Skip to content

Commit 9664491

Browse files
Working on merging pangolin changes
1 parent f240cd2 commit 9664491

File tree

5 files changed

+139
-25
lines changed

5 files changed

+139
-25
lines changed

package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"node-cache": "5.1.2",
3232
"pg": "8.16.3",
3333
"react": "19.2.0",
34+
"semver": "7.7.3",
3435
"winston": "3.18.3",
3536
"winston-daily-rotate-file": "5.0.0",
3637
"ws": "8.18.3",

server/lib/consts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from "path";
22
import { fileURLToPath } from "url";
33

44
// This is a placeholder value replaced by the build process
5-
export const APP_VERSION = "1.1.0";
5+
export const APP_VERSION = "1.1.2";
66

77
export const __FILENAME = fileURLToPath(import.meta.url);
88
export const __DIRNAME = path.dirname(__FILENAME);

server/lib/ip.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import { and, eq, isNotNull } from "drizzle-orm";
2-
import config from "@server/lib/config";
3-
41
interface IPRange {
52
start: bigint;
63
end: bigint;
@@ -231,4 +228,4 @@ export function isIpInCidr(ip: string, cidr: string): boolean {
231228
const ipBigInt = ipToBigInt(ip);
232229
const range = cidrToRange(cidr);
233230
return ipBigInt >= range.start && ipBigInt <= range.end;
234-
}
231+
}

0 commit comments

Comments
 (0)