Handle cache misses and RPC methods that are not in the config file

.env.default

@@ -1,9 +1,2 @@
 ENV=local
-REDIS_SERVER_PRIMARY_URL=localhost
-REDIS_SERVER_READ_URL=localhost
-REDIS_SERVER_PORT=6379
-READER_PORT=3000
-WRITER_PORT=3001
-READER_CONTAINER_IMAGE_REPO_URL=none
-WRITER_CONTAINER_IMAGE_REPO_URL=none
-AWS_REGION=none
+WRITER_URL=http://localhost:3001

rpc-cache-writer/Dockerfile → Dockerfile.reader

@@ -1,12 +1,14 @@
-FROM node:15-buster
+FROM node:16-buster
 
-ARG port=3000
-
-COPY . .
+ARG port=2999
+WORKDIR /app
+COPY ./package.json /app/
 
 RUN npm install
 
+COPY . /app/
+
 EXPOSE $port
 
 # Command can be overwritten by providing a different command in the template directly.
-CMD ["node", "dist/lib/rpc-cache-writer/src/writer.js"]
+CMD ["node", "dist/reader/index.js"]

Dockerfile.writer

@@ -0,0 +1,15 @@
+FROM node:16-buster
+
+ARG port=3001
+
+WORKDIR /app
+COPY ./package.json /app/
+
+RUN npm install
+
+COPY . /app/
+
+EXPOSE $port
+
+# Command can be overwritten by providing a different command in the template directly.
+CMD ["node", "dist/writer/index.js"]

babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ["@babel/preset-env", { targets: { node: "current" } }],
+    "@babel/preset-typescript",
+  ],
+};

build.sh

@@ -3,10 +3,5 @@
 echo "Compiling TypeScript..."
 tsc
 
-# Build and deploy Reader function along with API Gateway endpoint using AWS SAM CLI
-echo "Building Reader image..."
-docker build --build-arg port=$READER_PORT -t rpc-cache-reader -f rpc-cache-reader/Dockerfile .
-
-# Build and deploy Writer Docker image to ECS
-echo "Building Writer image..."
-docker build --build-arg port=$READER_PORT -t rpc-cache-writer -f rpc-cache-writer/Dockerfile .;
+echo "Building Docker Compose images"
+sudo docker-compose build --pull

docker-compose.yml

@@ -0,0 +1,23 @@
+version: "3.9"
+services:
+  reader:
+    build:
+      context: .
+      dockerfile: Dockerfile.reader
+    ports:
+      - "2999:2999"
+    depends_on:
+      - redis
+      - writer
+  writer:
+    build:
+      context: .
+      dockerfile: Dockerfile.writer
+    ports:
+      - "3001:3001"
+    depends_on:
+      - redis
+  redis:
+    image: "redis"
+    ports:
+      - "6379:6379"

package.json

@@ -1,77 +1,37 @@
 {
-  "name": "rpc-cache-server",
-  "version": "0.0.3",
-  "description": "A server to cache results of (expensive) RPC requests made to the Solana JSON RPC API",
-  "author": "Monadical",
-  "license": "APACHE",
-  "private": false,
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Monadical-SAS/rpc-cache-server.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Monadical-SAS/rpc-cache-server/issues"
-  },
-  "homepage": "https://github.com/Monadical-SAS/rpc-cache-server#readme",
-  "keywords": [
-    "rpc",
-    "solana",
-    "cache"
-  ],
-  "browser": {
-    "./dist/lib/rpc-cache-connection/src/index.js": "./dist.browser/lib/index.browser.esm.js"
-  },
-  "main": "./dist/lib/rpc-cache-connection/src/index.js",
+  "name": "new-rpc-caching",
+  "version": "1.0.0",
+  "main": "dist/index.js",
+  "author": "Thomas Lisankie",
+  "license": "MIT",
   "dependencies": {
-    "@solana/web3.js": "^1.10.1",
-    "aws-sdk": "^2.905.0",
-    "axios": "^0.21.1",
-    "body-parser": "^1.19.0",
-    "bs58": "^4.0.1",
+    "@solana/web3.js": "^1.29.1",
+    "axios": "^0.21.4",
     "cors": "^2.8.5",
-    "dotenv": "^9.0.2",
+    "dotenv": "^10.0.0",
     "express": "^4.17.1",
-    "json-rpc-2.0": "^0.2.16",
-    "node-fetch": "^2.6.1",
-    "redis": "^3.1.2",
-    "typescript": "^4.2.4"
+    "jayson": "^3.6.4",
+    "json-rpc-2.0": "^0.2.19",
+    "redis": "^3.1.2"
   },
-  "files": [
-    "dist/lib",
-    "dist.browser/lib"
-  ],
   "scripts": {
-    "lint:fix": "eslint --fix '*/{src,test}/**/*.ts' && prettier --write '*/{src,test}/**/*.ts'",
-    "build": "tsc && cross-env NODE_ENV=production rollup -c"
+    "test": "jest"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.3",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/plugin-transform-runtime": "^7.14.3",
-    "@babel/preset-env": "^7.14.2",
-    "@babel/preset-typescript": "^7.13.0",
-    "@babel/register": "^7.13.16",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^19.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
-    "@rollup/plugin-replace": "^2.4.2",
-    "@types/aws-lambda": "^8.10.76",
-    "@types/bs58": "^4.0.1",
-    "@types/cors": "^2.8.10",
-    "@types/express": "^4.17.11",
-    "@types/node": "^15.0.2",
-    "@types/node-fetch": "^2.5.10",
-    "@types/redis": "^2.8.28",
-    "@typescript-eslint/eslint-plugin": "^4.23.0",
-    "@typescript-eslint/parser": "^4.23.0",
-    "babel-plugin-root-import": "^6.6.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^7.26.0",
-    "eslint-config-prettier": "^8.3.0",
-    "prettier": "^2.3.0",
-    "rollup": "^2.48.0",
-    "rollup-plugin-node-polyfills": "^0.2.1",
-    "typescript": "^4.2.4"
+    "@babel/core": "^7.15.5",
+    "@babel/preset-env": "^7.15.6",
+    "@babel/preset-typescript": "^7.15.0",
+    "@types/cors": "^2.8.12",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.10.1",
+    "@types/redis": "^2.8.32",
+    "@types/redis-mock": "^0.17.0",
+    "@types/supertest": "^2.0.11",
+    "babel-jest": "^27.2.2",
+    "jest": "^27.2.2",
+    "redis-mock": "^0.56.3",
+    "supertest": "^6.1.6",
+    "typescript": "^4.4.3"
   }
 }