new test style

ts/sbd-server/package.json

@@ -2,22 +2,24 @@
   "name": "sbd-signal",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "scripts": {
     "deploy": "wrangler deploy",
     "dev": "wrangler dev",
     "start": "wrangler dev",
-    "test:fmt": "prettier -w src",
-    "test:type": "tsc --noEmit",
+    "test:fmt": "prettier -w src test",
+    "test:type": "tsc --noEmit --project ./src/tsconfig.json",
     "test:unit": "vitest run",
     "test": "npm run test:fmt && npm run test:type && npm run test:unit"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240620.0",
+    "@cloudflare/vitest-pool-workers": "^0.4.11",
+    "@cloudflare/workers-types": "^4.20240712.0",
     "node-cleanup": "^2.1.2",
     "prettier": "^3.3.2",
-    "typescript": "^5.5.2",
-    "vitest": "^1.6.0",
-    "wrangler": "^3.63.1"
+    "typescript": "^5.5.3",
+    "vitest": "1.5.0",
+    "wrangler": "^3.64.0"
   },
   "dependencies": {
     "@noble/ed25519": "^2.1.0",

ts/sbd-server/src/common.ts

@@ -19,6 +19,11 @@ export const BATCH_DUR_MS = 0;
  */
 export const LIMIT_NANOS_PER_BYTE = 8000;
 
+/**
+ * How many nanoseconds of rate limiting burst graceperiod is allowed
+ */
+export const LIMIT_NANOS_BURST = LIMIT_NANOS_PER_BYTE * 16 * 16 * 1024;
+
 /**
  * Milliseconds connections are allowed to remain idle before being closed.
  */
@@ -29,26 +34,28 @@ export const LIMIT_IDLE_MILLIS = 10000;
  */
 export const MAX_MESSAGE_BYTES = 20000;
 
-/**
+/*
+/ **
  * Cloudflare worker environment objects.
- */
+ * /
 export interface EnvExplicit {
   SBD_COORDINATION: KVNamespace;
   SIGNAL: DurableObjectNamespace;
   RATE_LIMIT: DurableObjectNamespace;
 }
 
-/**
+/ **
  * Cloudflare worker environment variables.
- */
+ * /
 export interface EnvVars {
   [index: string]: string;
 }
 
-/**
+/ **
  * Combined Cloudflare Env type.
- */
+ * /
 export type Env = EnvExplicit & EnvVars;
+*/
 
 /**
  * Mixin to allow errors with status codes.

ts/sbd-server/src/env.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Cloudflare worker environment objects.
+ */
+interface EnvExplicit {
+  SBD_COORDINATION: KVNamespace;
+  SIGNAL: DurableObjectNamespace;
+  RATE_LIMIT: DurableObjectNamespace;
+}
+
+/**
+ * Cloudflare worker environment variables.
+ */
+interface EnvVars {
+  [index: string]: string;
+}
+
+/**
+ * Combined Cloudflare Env type.
+ */
+type Env = EnvExplicit & EnvVars;

ts/sbd-server/src/index.ts

@@ -17,7 +17,7 @@ export { DoSignal };
 export default {
   async fetch(
     request: Request,
-    env: common.Env,
+    env: Env,
     ctx: ExecutionContext,
   ): Promise<Response> {
     try {
@@ -120,6 +120,7 @@ export default {
       const ipStub = env.RATE_LIMIT.get(ipId) as DurableObjectStub<DoRateLimit>;
       const { shouldBlock } = await ipStub.bytesReceived(
         Date.now(),
+        ip,
         pubKeyStr,
         1,
       );