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
2 changes: 1 addition & 1 deletion biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
"$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
Expand Down
8 changes: 4 additions & 4 deletions examples/server-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"dotenv": "^17.2.2",
"dotenv": "^17.2.3",
"express": "^5.1.0",
"generate-certs": "workspace:*",
"get-client-ip": "workspace:*",
Expand All @@ -22,9 +22,9 @@
"devDependencies": {
"@types/express": "^5.0.3",
"@types/morgan": "^1.9.10",
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"tsup": "^8.5.0",
"tsx": "^4.20.5",
"typescript": "^5.9.2"
"tsx": "^4.20.6",
"typescript": "^5.9.3"
}
}
8 changes: 4 additions & 4 deletions examples/server-nestjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@nestjs/core": "^11.1.6",
"@nestjs/mapped-types": "^2.1.0",
"@nestjs/platform-express": "^11.1.6",
"dotenv": "^17.2.2",
"dotenv": "^17.2.3",
"generate-certs": "workspace:*",
"get-client-ip": "workspace:*",
"modern-cookies": "workspace:*",
Expand All @@ -28,14 +28,14 @@
},
"devDependencies": {
"@nestjs/cli": "^11.0.10",
"@nestjs/schematics": "^11.0.7",
"@nestjs/schematics": "^11.0.8",
"@types/express": "^5.0.3",
"@types/morgan": "^1.9.10",
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"source-map-support": "^0.5.21",
"ts-loader": "^9.5.4",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.9.2"
"typescript": "^5.9.3"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"prepare": "husky"
},
"devDependencies": {
"@biomejs/biome": "2.2.4",
"@biomejs/biome": "2.2.5",
"husky": "^9.1.7",
"turbo": "^2.5.6"
"turbo": "^2.5.8"
},
"packageManager": "pnpm@10.15.0",
"packageManager": "pnpm@10.18.0",
"engines": {
"node": ">=22"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/compress-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
"test": "vitest"
},
"dependencies": {
"cipher-kit": "^1.0.1",
"cipher-kit": "^2.1.0",
"pako": "^2.1.0"
},
"devDependencies": {
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"@types/pako": "^2.0.4",
"tsup": "^8.5.0",
"typescript": "^5.9.2",
"typescript": "^5.9.3",
"vitest": "^3.2.4"
},
"author": "WolfieLeader",
Expand Down
46 changes: 29 additions & 17 deletions packages/compress-kit/src/compress.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { decode, encode, parseToObj, stringifyObj } from "cipher-kit/web-api";
import {
tryConvertBytesToStr,
tryConvertEncoding,
tryConvertStrToBytes,
tryParseToObj,
tryStringifyObj,
} from "cipher-kit/web-api";
import pako, { type DeflateFunctionOptions } from "pako";
import { $err, $ok, $stringifyError, type Result } from "./error";
import { $isStr, isInCompressionFormat } from "./utils";
Expand All @@ -15,16 +21,17 @@ export function compress(data: string): Result<string> {
try {
if (!$isStr(data)) return $err({ msg: "Empty string", desc: "Cannot compress null or undefined string" });

const encoded = encode(data, "utf8");
if (encoded.error) return $err({ msg: encoded.error.message, desc: encoded.error.description });
const bytes = tryConvertStrToBytes(data, "utf8");
if (bytes.error) return $err({ msg: bytes.error.message, desc: bytes.error.description });

const decoded = decode(encoded.bytes, "base64url");
if (decoded.error) return $err({ msg: decoded.error.message, desc: decoded.error.description });
const encoded = tryConvertEncoding(data, "utf8", "base64url");
if (encoded.error) return $err({ msg: encoded.error.message, desc: encoded.error.description });

const compressed = decode(pako.deflate(encoded.bytes, COMPRESSION_OPTIONS), "base64url");
const uncompressed = `${encoded.result}.0.`;
const compressed = tryConvertBytesToStr(pako.deflate(bytes.result, COMPRESSION_OPTIONS), "base64url");
if (compressed.error) return $err({ msg: compressed.error.message, desc: compressed.error.description });

if (decoded.result.length <= compressed.result.length) return $ok(`${decoded.result}.0.`);
if (uncompressed.length <= compressed.result.length) return $ok(uncompressed);
return $ok(`${compressed.result}.1.`);
} catch (error) {
return $err({ msg: "Compression error", desc: $stringifyError(error) });
Expand All @@ -33,24 +40,24 @@ export function compress(data: string): Result<string> {

export function decompress(data: string): Result<string> {
try {
if (isInCompressionFormat(data) === false) {
if (!isInCompressionFormat(data)) {
return $err({ msg: "Invalid format", desc: "String does not match expected compressed format" });
}

const str = data.slice(0, -3);
if (!$isStr(str, 1)) return $err({ msg: "Invalid input", desc: "Input is not a valid string" });

const encoded = encode(str, "base64url");
if (encoded.error) return $err({ msg: encoded.error.message, desc: encoded.error.description });
const bytes = tryConvertStrToBytes(str, "base64url");
if (bytes.error) return $err({ msg: bytes.error.message, desc: bytes.error.description });

if (data.endsWith(".1.")) {
return $ok(pako.inflate(encoded.bytes, { to: "string" }));
return $ok(pako.inflate(bytes.result, { to: "string" }));
}

if (data.endsWith(".0.")) {
const decoded = decode(encoded.bytes, "utf8");
if (decoded.error) return $err({ msg: decoded.error.message, desc: decoded.error.description });
return $ok(decoded.result);
const out = tryConvertEncoding(str, "base64url", "utf8");
if (out.error) return $err({ msg: out.error.message, desc: out.error.description });
return $ok(out.result);
}

return $err({ msg: "Invalid compression type", desc: "Expected .0. or .1. at the end of the string" });
Expand All @@ -60,13 +67,18 @@ export function decompress(data: string): Result<string> {
}

export function compressObj(data: Record<string, unknown>): Result<string> {
const { result, error } = stringifyObj(data);
if (error) return $err(error);
const { result, error } = tryStringifyObj(data);
if (error) return $err({ msg: error.message, desc: error.description });

return compress(result);
}

export function decompressObj(data: string): Result<{ result: Record<string, unknown> }> {
const { result, error } = decompress(data);
if (error) return $err(error);
return parseToObj(result);

const obj = tryParseToObj(result);
if (obj.error) return $err({ msg: obj.error.message, desc: obj.error.description });

return $ok({ result: obj.result });
}
4 changes: 2 additions & 2 deletions packages/generate-certs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"node-forge": "^1.3.1"
},
"devDependencies": {
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"@types/node-forge": "^1.3.14",
"tsup": "^8.5.0",
"typescript": "^5.9.2"
"typescript": "^5.9.3"
},
"author": "WolfieLeader",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/get-client-ip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
},
"devDependencies": {
"@types/express": "^5.0.3",
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"tsup": "^8.5.0",
"typescript": "^5.9.2"
"typescript": "^5.9.3"
},
"author": "WolfieLeader",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/modern-cookies/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
},
"devDependencies": {
"@types/express": "^5.0.3",
"@types/node": "^24.5.2",
"@types/node": "^24.6.2",
"tsup": "^8.5.0",
"typescript": "^5.9.2"
"typescript": "^5.9.3"
},
"author": "WolfieLeader",
"license": "MIT",
Expand Down
Loading