move propsDecoder (#41)

* move propsDecoder * Add Request as type * Update workers-types * Fix lint error
ensdomains · Apr 26, 2024 · b80d664 · b80d664
1 parent 0eba5cf
commit b80d664
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 42 deletions.
diff --git a/arb-gateway/src/worker.ts b/arb-gateway/src/worker.ts
@@ -1,8 +1,8 @@
 import { Request as CFWRequest } from '@cloudflare/workers-types';
 import { Server } from '@ensdomains/ccip-read-cf-worker';
-import type { Router } from '@ensdomains/evm-gateway';
+import { propsDecoder, type Router } from '@ensdomains/evm-gateway';
 import { InMemoryBlockCache } from './blockCache/InMemoryBlockCache.js';
-import { Tracker, type PropsDecoder } from '@ensdomains/server-analytics';
+import { Tracker } from '@ensdomains/server-analytics';
 interface Env {
   L1_PROVIDER_URL: string;
   L2_PROVIDER_URL: string;
@@ -13,23 +13,6 @@ interface Env {
 
 let app: Router;
 
-const propsDecoder: PropsDecoder<CFWRequest> = (request?: CFWRequest) => {
-  if (!request || !request.url) {
-    return {};
-  }
-  const trackingData = request.url.match(
-    /\/0x[a-fA-F0-9]{40}\/0x[a-fA-F0-9]{1,}\.json/
-  );
-  if (trackingData) {
-    return {
-      sender: trackingData[0].slice(1, 42),
-      calldata: trackingData[0].slice(44).replace('.json', ''),
-    };
-  } else {
-    return {};
-  }
-};
-
 async function fetch(request: CFWRequest, env: Env) {
   // Set PROVIDER_URL under .dev.vars locally. Set the key as secret remotely with `wrangler secret put WORKER_PROVIDER_URL`
   const {

diff --git a/bun.lockb b/bun.lockb
diff --git a/evm-gateway/package.json b/evm-gateway/package.json
@@ -6,7 +6,7 @@
   "module": "./_esm/index.js",
   "dependencies": {
     "@chainlink/ccip-read-server": "^0.2.1",
-    "@cloudflare/workers-types": "^4.20240117.0",
+    "@cloudflare/workers-types": "^4.20240423.0",
     "@ensdomains/ccip-read-cf-worker": "^0.0.1",
     "ethers": "^6.7.1"
   },

diff --git a/evm-gateway/src/index.ts b/evm-gateway/src/index.ts
@@ -1,4 +1,4 @@
 export { EVMGateway, StorageLayout } from './EVMGateway.js';
 export { EVMProofHelper, type StateProof } from './EVMProofHelper.js';
 export type { IProofService, ProvableBlock } from './IProofService.js';
-export type { Router } from './utils.js';
+export { propsDecoder, type Router } from './utils.js';
diff --git a/evm-gateway/src/utils.ts b/evm-gateway/src/utils.ts
@@ -1,5 +1,24 @@
-import { Request as CFWRequest } from '@cloudflare/workers-types';
-
+import { type Request as CFWRequest } from '@cloudflare/workers-types';
+import { type PropsDecoder } from '@ensdomains/server-analytics';
 export interface Router {
   handle: (request: CFWRequest) => Promise<Response>;
 }
+
+export const propsDecoder: PropsDecoder<CFWRequest> = (
+  request?: CFWRequest
+) => {
+  if (!request || !request.url) {
+    return {};
+  }
+  const trackingData = request.url.match(
+    /\/0x[a-fA-F0-9]{40}\/0x[a-fA-F0-9]{1,}\.json/
+  );
+  if (trackingData) {
+    return {
+      sender: trackingData[0].slice(1, 42),
+      calldata: trackingData[0].slice(44).replace('.json', ''),
+    };
+  } else {
+    return {};
+  }
+};
diff --git a/op-gateway/src/worker.ts b/op-gateway/src/worker.ts
@@ -1,7 +1,7 @@
 import { Request as CFWRequest } from '@cloudflare/workers-types';
 import { Server } from '@ensdomains/ccip-read-cf-worker';
-import type { Router } from '@ensdomains/evm-gateway';
-import { Tracker, type PropsDecoder } from '@ensdomains/server-analytics';
+import { propsDecoder, type Router } from '@ensdomains/evm-gateway';
+import { Tracker } from '@ensdomains/server-analytics';
 
 interface Env {
   L1_PROVIDER_URL: string;
@@ -14,23 +14,6 @@ interface Env {
 
 let app: Router;
 
-const propsDecoder: PropsDecoder<CFWRequest> = (request?: CFWRequest) => {
-  if (!request || !request.url) {
-    return {};
-  }
-  const trackingData = request.url.match(
-    /\/0x[a-fA-F0-9]{40}\/0x[a-fA-F0-9]{1,}\.json/
-  );
-  if (trackingData) {
-    return {
-      sender: trackingData[0].slice(1, 42),
-      calldata: trackingData[0].slice(44).replace('.json', ''),
-    };
-  } else {
-    return {};
-  }
-};
-
 async function fetch(request: CFWRequest, env: Env) {
   // Set PROVIDER_URL under .dev.vars locally. Set the key as secret remotely with `wrangler secret put WORKER_PROVIDER_URL`
   const {