Merge pull request #659 from Merit-Systems/br/knip-server

Add PNPM Knip and Env.ts

Author: zdql

.github/workflows/integration-tests.yml

@@ -57,6 +57,9 @@ jobs:
       CDP_API_KEY_SECRET: ${{ secrets.CDP_API_KEY_SECRET }}
       CDP_WALLET_SECRET: ${{ secrets.CDP_WALLET_SECRET }}
 
+      # Facilitator Configuration
+      PROXY_FACILITATOR_URL: ${{ secrets.PROXY_FACILITATOR_URL }}
+
       # OAuth Configuration (short expiry for fast integration tests)
       OAUTH_REFRESH_TOKEN_EXPIRY_SECONDS: 5
       OAUTH_ACCESS_TOKEN_EXPIRY_SECONDS: 5
@@ -150,6 +153,9 @@ jobs:
           CDP_WALLET_SECRET=${{ secrets.CDP_WALLET_SECRET }}
           WALLET_OWNER="integration-test-owner"
 
+          # Facilitator Configuration
+          PROXY_FACILITATOR_URL=${{ secrets.PROXY_FACILITATOR_URL }}
+
           # OAuth Configuration
           OAUTH_REFRESH_TOKEN_EXPIRY_SECONDS=5
           OAUTH_ACCESS_TOKEN_EXPIRY_SECONDS=5
@@ -230,6 +236,7 @@ jobs:
           DATABASE_URL="${DATABASE_URL}" \
           NODE_ENV=test \
           PORT=3069 \
+          PROXY_FACILITATOR_URL="${PROXY_FACILITATOR_URL}" \
           OPENAI_API_KEY="${OPENAI_API_KEY}" \
           ANTHROPIC_API_KEY="${ANTHROPIC_API_KEY}" \
           CDP_API_KEY_ID="${CDP_API_KEY_ID}" \
@@ -343,6 +350,9 @@ jobs:
       CDP_API_KEY_SECRET: ${{ secrets.CDP_API_KEY_SECRET }}
       CDP_WALLET_SECRET: ${{ secrets.CDP_WALLET_SECRET }}
 
+      # Facilitator Configuration
+      PROXY_FACILITATOR_URL: ${{ secrets.PROXY_FACILITATOR_URL }}
+
       # OAuth Configuration
       OAUTH_REFRESH_TOKEN_EXPIRY_SECONDS: 2592000
       OAUTH_ACCESS_TOKEN_EXPIRY_SECONDS: 86400
@@ -397,6 +407,7 @@ jobs:
           CDP_API_KEY_ID=${{ secrets.CDP_API_KEY_ID }}
           CDP_API_KEY_SECRET=${{ secrets.CDP_API_KEY_SECRET }}
           CDP_WALLET_SECRET=${{ secrets.CDP_WALLET_SECRET }}
+          PROXY_FACILITATOR_URL=${{ secrets.PROXY_FACILITATOR_URL }}
           OAUTH_REFRESH_TOKEN_EXPIRY_SECONDS=2592000
           CI=true
           NODE_ENV=test

packages/app/server/knip.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/knip@latest/schema.json",
+  "ignore": [
+    "/scripts/**",
+    "/src/__tests__/**",
+    "/src/generated/**",
+    "/src/clients/**",
+    "/dist/**"
+  ],
+  "ignoreDependencies": ["@merit-systems/echo-typescript-sdk"]
+}

packages/app/server/package.json

@@ -2,7 +2,7 @@
   "name": "echo-server",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "dist/server.js",
   "scripts": {
     "copy-schema": "mkdir -p prisma && cp ../control/prisma/schema.prisma prisma/ && cp -r ../control/prisma/migrations prisma/",
     "prisma:generate": "pnpx prisma generate",
@@ -33,6 +33,7 @@
     "type-check": "tsc --noEmit",
     "format": "prettier --write src/**/*.{ts,js}",
     "format:check": "prettier --check src/**/*.{ts,js}",
+    "knip": "knip",
     "docker:build": "./scripts/build-local-docker.sh",
     "docker:run": "./scripts/run-local-docker.sh",
     "docker:build-and-run": "pnpm run docker:build && pnpm run docker:run"
@@ -42,7 +43,6 @@
   "license": "ISC",
   "dependencies": {
     "@coinbase/cdp-sdk": "^1.34.0",
-    "@coinbase/x402": "^0.6.5",
     "@e2b/code-interpreter": "^2.0.1",
     "@google-cloud/storage": "^7.17.1",
     "@google/genai": "^1.20.0",
@@ -58,28 +58,25 @@
     "@opentelemetry/semantic-conventions": "^1.36.0",
     "@opentelemetry/winston-transport": "^0.14.1",
     "@prisma/client": "6.16.0",
+    "@t3-oss/env-core": "^0.13.8",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.19",
     "@types/express": "^4.17.21",
     "@types/multer": "^2.0.0",
-    "@types/node": "^20.11.24",
-    "@types/node-fetch": "^2.6.11",
+    "@types/node": "^20.19.16",
     "compression": "^1.8.0",
     "cors": "^2.8.5",
     "dotenv": "^16.5.0",
     "express": "^4.18.3",
     "google-auth-library": "^10.3.0",
     "jose": "^6.0.11",
     "multer": "^2.0.2",
-    "node-fetch": "^2.7.0",
     "openai": "^6.2.0",
     "prisma": "6.16.0",
-    "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
     "uuid": "^11.1.0",
     "viem": "^2.33.3",
     "winston": "^3.17.0",
-    "x402-express": "^0.6.5",
     "zod": "^4.1.11"
   },
   "devDependencies": {
@@ -88,6 +85,8 @@
     "@typescript-eslint/eslint-plugin": "^8.34.1",
     "@typescript-eslint/parser": "^8.34.1",
     "eslint": "^9.29.0",
+    "knip": "^5.63.1",
+    "prettier": "^3.4.2",
     "supertest": "^6.3.4",
     "tsup": "^8.5.0",
     "tsx": "^4.20.5",

packages/app/server/src/__tests__/responses.test.ts

@@ -4,6 +4,7 @@ import type {
   ResponseInputItem,
 } from 'openai/resources/responses/responses';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 // Load environment variables from .env file
 dotenv.config();
@@ -13,15 +14,13 @@ describe('Echo API Test', () => {
 
   beforeAll(() => {
     // Check if ECHO_API_KEY is set
-    if (!process.env.ECHO_API_KEY) {
+    if (!env.ECHO_API_KEY) {
       throw new Error('ECHO_API_KEY environment variable is not set');
     }
 
-    console.log('ECHO_API_KEY:', process.env.ECHO_API_KEY);
-
     // Create OpenAI client with echo.router.merit.systems baseURL
     oai = new OpenAI({
-      apiKey: process.env.ECHO_API_KEY,
+      apiKey: env.ECHO_API_KEY,
       baseURL: 'http://localhost:3070',
       timeout: 30000,
     });
@@ -43,7 +42,7 @@ describe('Echo API Test', () => {
     console.log('Base URL:', oai.baseURL);
     console.log(
       'API Key (first 10 chars):',
-      process.env.ECHO_API_KEY?.substring(0, 10) + '...'
+      env.ECHO_API_KEY?.substring(0, 10) + '...'
     );
     console.log('Input being sent:', JSON.stringify(input, null, 2));
     console.log('==========================');

packages/app/server/src/clients/anthropic-client.ts

@@ -1,5 +1,6 @@
 import Anthropic from '@anthropic-ai/sdk';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
@@ -8,7 +9,7 @@ async function makeRequest(useStreaming: boolean = true) {
     // Initialize OpenAI client with custom baseURL
     const claude = new Anthropic({
       baseURL: 'http://localhost:3070',
-      apiKey: process.env.ECHO_API_KEY, // Required by the client but not used with local server
+      apiKey: env.ECHO_API_KEY, // Required by the client but not used with local server
     });
 
     if (useStreaming) {

packages/app/server/src/clients/anthropic-gpt-client.ts

@@ -1,5 +1,6 @@
 import OpenAI from 'openai';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
@@ -8,7 +9,7 @@ async function makeRequest(useStreaming: boolean = false) {
     // Initialize OpenAI client with custom baseURL
     const openai = new OpenAI({
       baseURL: 'http://localhost:3070',
-      apiKey: process.env.ECHO_API_KEY, // Required by the client but not used with local server
+      apiKey: env.ECHO_API_KEY, // Required by the client but not used with local server
     });
 
     if (useStreaming) {

packages/app/server/src/clients/gemini-client.ts

@@ -1,14 +1,15 @@
 import { GoogleGenAI } from '@google/genai';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
 async function makeRequest(useStreaming: boolean = false) {
   try {
     // Initialize Gemini client
     const ai = new GoogleGenAI({
-      apiKey: process.env.ECHO_API_KEY || '',
-      // apiKey: process.env.GEMINI_API_KEY || '',
+      apiKey: env.ECHO_API_KEY || '',
+      // apiKey: env.GEMINI_API_KEY || '',
       httpOptions: {
         baseUrl: 'http://localhost:3070',
       },

packages/app/server/src/clients/gemini-gpt-client.ts

@@ -1,5 +1,6 @@
 import OpenAI from 'openai';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
@@ -8,7 +9,7 @@ async function makeRequest(useStreaming: boolean = false) {
     // Initialize OpenAI client with custom baseURL
     const openai = new OpenAI({
       baseURL: 'http://localhost:3070',
-      apiKey: process.env.ECHO_API_KEY, // Required by the client but not used with local server
+      apiKey: env.ECHO_API_KEY, // Required by the client but not used with local server
     });
 
     if (useStreaming) {

packages/app/server/src/clients/gpt-client.ts

@@ -1,5 +1,6 @@
 import OpenAI from 'openai';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
@@ -8,7 +9,7 @@ async function makeRequest(useStreaming: boolean = false) {
     // Initialize OpenAI client with custom baseURL
     const openai = new OpenAI({
       baseURL: 'http://localhost:3070/5b20a7e2-f4eb-4879-b889-dc19148a6b06',
-      apiKey: process.env.ECHO_API_KEY, // Required by the client but not used with local server
+      apiKey: env.ECHO_API_KEY, // Required by the client but not used with local server
     });
 
     if (useStreaming) {

packages/app/server/src/clients/openai-image-formdata-client.ts

@@ -2,14 +2,15 @@ import OpenAI, { toFile } from 'openai';
 import fs from 'fs';
 import path from 'path';
 import dotenv from 'dotenv';
+import { env } from '../env';
 
 dotenv.config();
 
 async function makeImageEditRequest() {
   try {
     // Initialize OpenAI client
     const client = new OpenAI({
-      apiKey: process.env.ECHO_API_KEY || '',
+      apiKey: env.ECHO_API_KEY || '',
       baseURL: 'http://localhost:3070',
     });
 
@@ -73,7 +74,7 @@ async function makeImageEditRequestWithMultipleImages() {
   try {
     // Initialize OpenAI client
     const client = new OpenAI({
-      apiKey: process.env.ECHO_API_KEY || '',
+      apiKey: env.ECHO_API_KEY || '',
       baseURL: 'http://localhost:3070/v1',
     });