@agentlayer.tech/wallet 0.1.90 → 0.1.92

package/wdk-evm-wallet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wdk-evm-wallet",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "private": true,
   "type": "module",
   "description": "Separate EVM wallet service built on Tether WDK.",
@@ -8,7 +8,7 @@
     "bootstrap": "sh ./bootstrap.sh",
     "start:local": "sh ./run-local.sh",
     "start": "node src/server.js",
-    "check": "node --check src/server.js && node --check src/wdk_evm_wallet.js && node --check src/config.js && node --check src/json.js && node --check src/local_vault.js && node --check src/network_state.js",
+    "check": "node --check src/server.js && node --check src/shutdown.js && node --check src/wdk_evm_wallet.js && node --check src/config.js && node --check src/json.js && node --check src/local_vault.js && node --check src/network_state.js",
     "test:swap-runtime": "node --test --test-concurrency=1 tests/smoke_swap_runtime.mjs",
     "test:aave-runtime": "node --test --test-concurrency=1 tests/smoke_aave_runtime.mjs",
     "test:morpho-runtime": "node --test --test-concurrency=1 tests/smoke_morpho_runtime.mjs",
@@ -16,6 +16,7 @@
     "test:uniswap-runtime": "node --test --test-concurrency=1 tests/smoke_uniswap_runtime.mjs",
     "test:unit": "node --test tests/unit_uniswap_helpers.mjs",
     "test:identity": "node --test tests/unit_instance_identity.mjs",
+    "test:shutdown": "node --test tests/shutdown.test.mjs",
     "test:network-config": "node --test tests/unit_network_config.mjs",
     "test:network-state": "node --test tests/unit_network_state.mjs",
     "test:wallet-network": "node --test tests/unit_wdk_wallet_network.mjs"

package/wdk-evm-wallet/src/server.js

@@ -7,6 +7,7 @@ import { loadConfig } from "./config.js";
 import { readJsonBody, sendJson } from "./json.js";
 import { LocalEvmVault } from "./local_vault.js";
 import { EvmNetworkState } from "./network_state.js";
+import { createShutdownCoordinator, withTrackedRequest } from "./shutdown.js";
 import { WdkEvmWalletService } from "./wdk_evm_wallet.js";
 
 const config = loadConfig();
@@ -683,12 +684,32 @@ async function handleRequest(request, response) {
 }
 
 const server = createServer((request, response) => {
-  handleRequest(request, response).catch((error) => {
-    const shaped = toErrorResponse(error, new URL(request.url || "/", "http://localhost").pathname, 500);
-    sendJson(response, shaped.statusCode, shaped.payload);
+  void withTrackedRequest(shutdown, async () => {
+    try {
+      await handleRequest(request, response);
+    } catch (error) {
+      const shaped = toErrorResponse(
+        error,
+        new URL(request.url || "/", "http://localhost").pathname,
+        500,
+      );
+      sendJson(response, shaped.statusCode, shaped.payload);
+    }
   });
 });
 
+// 8s stays strictly inside the 10s SIGTERM->SIGKILL window the Python client
+// allows (agent_wallet/evm_user_wallets.py), so the orderly path always wins.
+const shutdown = createShutdownCoordinator({
+  closeServer: () => server.close(),
+  exit: (code) => process.exit(code),
+  graceMs: 8000,
+  log: (message) => console.log(message),
+});
+
+process.on("SIGTERM", () => shutdown.begin("SIGTERM"));
+process.on("SIGINT", () => shutdown.begin("SIGINT"));
+
 server.listen(config.port, config.host, () => {
   console.log(
     `wdk-evm-wallet listening on ${config.host}:${config.port} (${config.network})`

package/wdk-evm-wallet/src/shutdown.js

@@ -0,0 +1,63 @@
+// Coordinates an orderly shutdown: stop accepting connections, let in-flight
+// requests finish, then exit. Vault writes are not atomic (see local_vault.js),
+// so an abrupt exit mid-write can truncate a wallet file. Every dependency is
+// injectable so the drain loop can be tested without real timers.
+export function createShutdownCoordinator({
+  closeServer,
+  exit,
+  now = () => Date.now(),
+  schedule = (fn, ms) => setTimeout(fn, ms),
+  graceMs = 8000,
+  pollMs = 100,
+  log = () => {},
+}) {
+  let inFlight = 0;
+  let shuttingDown = false;
+
+  function begin(signalName) {
+    if (shuttingDown) return;
+    shuttingDown = true;
+    log(
+      `wdk-evm-wallet received ${signalName}, draining ${inFlight} in-flight request(s)`,
+    );
+    closeServer();
+
+    const deadline = now() + graceMs;
+    const tick = () => {
+      if (inFlight <= 0 || now() >= deadline) {
+        exit(0);
+        return;
+      }
+      schedule(tick, pollMs);
+    };
+    tick();
+  }
+
+  return {
+    begin,
+    trackStart() {
+      inFlight += 1;
+    },
+    trackEnd() {
+      if (inFlight > 0) inFlight -= 1;
+    },
+    isShuttingDown() {
+      return shuttingDown;
+    },
+    get inFlight() {
+      return inFlight;
+    },
+  };
+}
+
+// Track the lifetime of the handler itself, not the HTTP connection. A client
+// can disconnect while a vault write or transaction is still running, and the
+// response "close" event must not make shutdown treat that work as finished.
+export async function withTrackedRequest(coordinator, handler) {
+  coordinator.trackStart();
+  try {
+    return await handler();
+  } finally {
+    coordinator.trackEnd();
+  }
+}