update types, add resolverKey

namestonehq · Jul 17, 2024 · 48a9615 · 48a9615
1 parent a1f4c3e
commit 48a9615
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
@@ -346,10 +346,10 @@ function serve(ezccip, {port = 0, resolvers, log = true, protocol = 'tor', signi
 						let v = [];
 						for await (let x of req) v.push(x);
 						let {sender, data: calldata} = JSON.parse(Buffer.concat(v));
-						let key = url.slice(1);
-						let resolver = resolvers ? resolvers[key] : sender;
-						if (!resolver) throw error_with('unknown resolver', {status: 404, key});
-						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, ip, ...a});
+						let resolverKey = url.slice(1);
+						let resolver = resolvers?.[resolverKey] ?? sender;
+						if (!resolver) throw error_with('unknown resolver', {status: 404, resolverKey});
+						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, resolverKey, ip, ...a});
 						log?.(ip, url, history.toString());
 						write_json(reply, {data});
 						break;

diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -29,19 +29,18 @@ type CallContext = {
 	calldata: HexString;
 	protocol: SigningProtocol;
 	resolver: HexString;
+	resolverKey: string;
 	history: History;
 } & CallContextExtra;
 type CCIPReadFunction = (args: Result, context: CallContext, history: History) => Promise<BytesLike | any[] | undefined>; 
 type CCIPReadHandler = {abi: Interface, frag: FunctionFragment, fn: CCIPReadFunction};
 type ENSIP10Function = (name: string, context: CallContext) => Promise<Record | undefined>;
 type EZCCIPConfig = {
 	protocol?: SigningProtocol;
-	resolver?: HexString;
 	signingKey?: SigningKey | HexString;
 	ttlSec?: number;
 	recursionLimit?: number;
 } & CallContextExtra;
-
 export class EZCCIP {
 	enableENSIP10(get: ENSIP10Function, options?: {multicall?: boolean}): void;
 	register(abi: string | string[] | Interface, impl: CCIPReadFunction | {[name: string]: CCIPReadFunction}): CCIPReadHandler[];

diff --git a/dist/index.mjs b/dist/index.mjs
@@ -344,10 +344,10 @@ function serve(ezccip, {port = 0, resolvers, log = true, protocol = 'tor', signi
 						let v = [];
 						for await (let x of req) v.push(x);
 						let {sender, data: calldata} = JSON.parse(Buffer.concat(v));
-						let key = url.slice(1);
-						let resolver = resolvers ? resolvers[key] : sender;
-						if (!resolver) throw error_with('unknown resolver', {status: 404, key});
-						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, ip, ...a});
+						let resolverKey = url.slice(1);
+						let resolver = resolvers?.[resolverKey] ?? sender;
+						if (!resolver) throw error_with('unknown resolver', {status: 404, resolverKey});
+						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, resolverKey, ip, ...a});
 						log?.(ip, url, history.toString());
 						write_json(reply, {data});
 						break;

diff --git a/src/serve.js b/src/serve.js
@@ -32,10 +32,10 @@ export function serve(ezccip, {port = 0, resolvers, log = true, protocol = 'tor'
 						let v = [];
 						for await (let x of req) v.push(x);
 						let {sender, data: calldata} = JSON.parse(Buffer.concat(v));
-						let key = url.slice(1);
-						let resolver = resolvers ? resolvers[key] : sender;
-						if (!resolver) throw error_with('unknown resolver', {status: 404, key});
-						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, ip, ...a});
+						let resolverKey = url.slice(1);
+						let resolver = resolvers?.[resolverKey] ?? sender;
+						if (!resolver) throw error_with('unknown resolver', {status: 404, resolverKey});
+						let {data, history} = await ezccip.handleRead(sender, calldata, {protocol, signingKey, resolver, resolverKey, ip, ...a});
 						log?.(ip, url, history.toString());
 						write_json(reply, {data});
 						break;