refactor: combine sub-pkgs into one pkg

pkgs/pow-captcha/package.json

@@ -1,11 +1,12 @@
 {
-	"name": "@pow-captcha/shared",
+	"name": "@pow-captcha/pow-captcha",
 	"version": "0.0.0",
 	"main": "dist/lib.js",
 	"type": "module",
 	"types": "dist/lib.d.ts",
 	"scripts": {
-		"build": "tsc -p tsconfig.build.json"
+		"build": "tsc -p tsconfig.build.json",
+		"test": "jest"
 	},
 	"dependencies": {
 		"base64-js": "^1.5.1",

pkgs/pow-captcha/src/lib.ts

@@ -0,0 +1,5 @@
+import * as server from "./server";
+import * as solver from "./solver";
+import * as wire from "./wire";
+
+export { server, solver, wire };

pkgs/pow-captcha/src/server.spec.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "@jest/globals";
-import { wire } from "@pow-captcha/shared";
+import * as wire from "./wire";
-import * as server from "./lib";
+import * as server from "./server";
 
 const SECRET = "e2c0b4ab-a215-4b36-bba8-19fae1601045";
 

pkgs/pow-captcha/src/server.ts

@@ -1,5 +1,6 @@
-import { utils, wire } from "@pow-captcha/shared";
+import * as wire from "./wire";
-import * as solver from "@pow-captcha/solver";
+import * as solver from "./solver";
+import { createArray } from "./utils";
 
 export type CreateChallengesOptions = {
 	/** @default 50 */
@@ -15,21 +16,15 @@ export async function createChallengesRaw({
 	challengeLength = 16,
 	difficulty = 2,
 }: CreateChallengesOptions): Promise<wire.Challenge> {
-	const challenges = utils.createArray(
+	const challenges = createArray(challengeCount, (): wire.ChallengeEntry => {
-		challengeCount,
-		(): wire.ChallengeEntry => {
 		const challenge = new Uint8Array(challengeLength);
 		crypto.getRandomValues(challenge);
 
 		const target = new Uint8Array(difficulty);
 		crypto.getRandomValues(target);
 
-			return [
+		return [wire.serializeArray(challenge), wire.serializeArray(target)];
-				wire.serializeArray(challenge),
+	});
-				wire.serializeArray(target),
-			];
-		},
-	);
 
 	return {
 		magic: wire.CHALLENGE_MAGIC,
@@ -41,10 +36,8 @@ export async function createChallenges(
 	options: CreateChallengesOptions,
 	secret: string,
 ): Promise<wire.SignedData> {
-	return await wire.serializeAndSignData(
+	const data = await createChallengesRaw(options);
-		createChallengesRaw(options),
+	return await wire.serializeAndSignData(data, secret);
-		secret,
-	);
 }
 
 export async function redeemChallengeSolutionRaw(

pkgs/pow-captcha/src/solver.spec.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "@jest/globals";
-import * as solver from "./lib";
+import * as solver from "./solver";
 
 describe("solver", () => {
 	it("solveJs", async () => {

pkgs/pow-captcha/src/solver.ts

@@ -1,3 +1,5 @@
+import { arrayStartsWith } from "./utils";
+
 export async function solveJs(
 	nonce: Uint8Array,
 	target: Uint8Array,
@@ -42,16 +44,3 @@ export async function verify(
 
 	return arrayStartsWith(hash, target);
 }
-
-function arrayStartsWith(array: Uint8Array, search: Uint8Array): boolean {
-	const searchLen = search.length;
-	if (searchLen > array.length) {
-		return false;
-	}
-	for (let i = 0; i < searchLen; i += 1) {
-		if (array[i] !== search[i]) {
-			return false;
-		}
-	}
-	return true;
-}

pkgs/pow-captcha/src/utils.ts

@@ -17,3 +17,16 @@ export function byteArraysEqual(arr1: Uint8Array, arr2: Uint8Array): boolean {
 	}
 	return true;
 }
+
+export function arrayStartsWith(array: Uint8Array, search: Uint8Array): boolean {
+	const searchLen = search.length;
+	if (searchLen > array.length) {
+		return false;
+	}
+	for (let i = 0; i < searchLen; i += 1) {
+		if (array[i] !== search[i]) {
+			return false;
+		}
+	}
+	return true;
+}

pkgs/server/package.json

@@ -1,15 +0,0 @@
-{
-	"name": "@pow-captcha/server",
-	"version": "0.0.0",
-	"main": "dist/lib.js",
-	"type": "module",
-	"types": "dist/lib.d.ts",
-	"scripts": {
-		"build": "tsc -p tsconfig.build.json",
-		"test": "jest"
-	},
-	"dependencies": {
-		"@pow-captcha/solver": "workspace:*",
-		"@pow-captcha/shared": "workspace:*"
-	}
-}

pkgs/shared/src/lib.ts

@@ -1,2 +0,0 @@
-export * as wire from "./wire";
-export * as utils from "./utils";

pkgs/shared/tsconfig.build.json

@@ -1,8 +0,0 @@
-{
-	"extends": "../../tsconfig.build.json",
-	"compilerOptions": {
-		"outDir": "dist"
-	},
-	"include": ["src/**/*"],
-	"exclude": ["**/*.spec.ts"]
-}

pkgs/shared/tsconfig.json

@@ -1,4 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"include": ["src/**/*"]
-}

pkgs/solver/jest.config.js

@@ -1,6 +0,0 @@
-/** @type {import('jest').Config} */
-export default {
-	transform: {
-		"^.+\\.(t|j)sx?$": "@swc/jest",
-	},
-};

pkgs/solver/package.json

@@ -1,11 +0,0 @@
-{
-	"name": "@pow-captcha/solver",
-	"version": "0.0.0",
-	"main": "dist/lib.js",
-	"type": "module",
-	"types": "dist/lib.d.ts",
-	"scripts": {
-		"build": "tsc -p tsconfig.build.json",
-		"test": "jest"
-	}
-}

pkgs/solver/tsconfig.build.json

@@ -1,8 +0,0 @@
-{
-	"extends": "../../tsconfig.build.json",
-	"compilerOptions": {
-		"outDir": "dist"
-	},
-	"include": ["src/**/*"],
-	"exclude": ["**/*.spec.ts"]
-}

pkgs/solver/tsconfig.json

@@ -1,4 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"include": ["src/**/*"]
-}

pnpm-lock.yaml

@@ -42,16 +42,7 @@ importers:
         specifier: ^8.35.0
         version: 8.35.0(eslint@9.29.0)(typescript@5.8.3)
 
-  pkgs/server:
+  pkgs/pow-captcha:
-    dependencies:
-      '@pow-captcha/shared':
-        specifier: workspace:*
-        version: link:../shared
-      '@pow-captcha/solver':
-        specifier: workspace:*
-        version: link:../solver
-
-  pkgs/shared:
     dependencies:
       base64-js:
         specifier: ^1.5.1
@@ -60,7 +51,7 @@ importers:
         specifier: ^3.25.67
         version: 3.25.67
 
-  pkgs/solver: {}
+  pkgs/solver-wasm: {}
 
 packages: