@reclaimprotocol/attestor-core 3.1.1 → 4.0.1

package/lib/server/handlers/disconnectTunnel.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.disconnectTunnel = void 0;
 const disconnectTunnel = async ({ id }, { client }) => {
     const tunnel = client.getTunnel(id);
-    await tunnel.close(new Error('Tunnel disconnected'));
+    await tunnel.close();
     return {};
 };
 exports.disconnectTunnel = disconnectTunnel;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY29ubmVjdFR1bm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvZGlzY29ubmVjdFR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFTyxNQUFNLGdCQUFnQixHQUFtQyxLQUFLLEVBQ3BFLEVBQUUsRUFBRSxFQUFFLEVBQ04sRUFBRSxNQUFNLEVBQUUsRUFDVCxFQUFFO0lBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNuQyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFBO0lBRXBELE9BQU8sRUFBRSxDQUFBO0FBQ1YsQ0FBQyxDQUFBO0FBUlksUUFBQSxnQkFBZ0Isb0JBUTVCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY29ubmVjdFR1bm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvZGlzY29ubmVjdFR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFTyxNQUFNLGdCQUFnQixHQUFtQyxLQUFLLEVBQ3BFLEVBQUUsRUFBRSxFQUFFLEVBQ04sRUFBRSxNQUFNLEVBQUUsRUFDVCxFQUFFO0lBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNuQyxNQUFNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUVwQixPQUFPLEVBQUUsQ0FBQTtBQUNWLENBQUMsQ0FBQTtBQVJZLFFBQUEsZ0JBQWdCLG9CQVE1QiJ9

package/lib/server/handlers/index.js

@@ -7,12 +7,14 @@ const createClaimOnChain_1 = require("../../server/handlers/createClaimOnChain")
 const createTunnel_1 = require("../../server/handlers/createTunnel");
 const disconnectTunnel_1 = require("../../server/handlers/disconnectTunnel");
 const init_1 = require("../../server/handlers/init");
+const toprf_1 = require("../../server/handlers/toprf");
 exports.HANDLERS = {
     createTunnel: createTunnel_1.createTunnel,
     disconnectTunnel: disconnectTunnel_1.disconnectTunnel,
     claimTunnel: claimTunnel_1.claimTunnel,
     init: init_1.init,
     createClaimOnChain: createClaimOnChain_1.createClaimOnChain,
-    completeClaimOnChain: completeClaimOnChain_1.completeClaimOnChain
+    completeClaimOnChain: completeClaimOnChain_1.completeClaimOnChain,
+    toprf: toprf_1.toprf,
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL2hhbmRsZXJzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlFQUE2RDtBQUM3RCxtRkFBK0U7QUFDL0UsK0VBQTJFO0FBQzNFLG1FQUErRDtBQUMvRCwyRUFBdUU7QUFDdkUsbURBQStDO0FBR2xDLFFBQUEsUUFBUSxHQUFzQztJQUMxRCxZQUFZLEVBQVosMkJBQVk7SUFDWixnQkFBZ0IsRUFBaEIsbUNBQWdCO0lBQ2hCLFdBQVcsRUFBWCx5QkFBVztJQUNYLElBQUksRUFBSixXQUFJO0lBQ0osa0JBQWtCLEVBQWxCLHVDQUFrQjtJQUNsQixvQkFBb0IsRUFBcEIsMkNBQW9CO0NBQ3BCLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL2hhbmRsZXJzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlFQUE2RDtBQUM3RCxtRkFBK0U7QUFDL0UsK0VBQTJFO0FBQzNFLG1FQUErRDtBQUMvRCwyRUFBdUU7QUFDdkUsbURBQStDO0FBQy9DLHFEQUFpRDtBQUdwQyxRQUFBLFFBQVEsR0FBc0M7SUFDMUQsWUFBWSxFQUFaLDJCQUFZO0lBQ1osZ0JBQWdCLEVBQWhCLG1DQUFnQjtJQUNoQixXQUFXLEVBQVgseUJBQVc7SUFDWCxJQUFJLEVBQUosV0FBSTtJQUNKLGtCQUFrQixFQUFsQix1Q0FBa0I7SUFDbEIsb0JBQW9CLEVBQXBCLDJDQUFvQjtJQUNwQixLQUFLLEVBQUwsYUFBSztDQUNMLENBQUEifQ==

package/lib/server/handlers/init.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
+const ethers_1 = require("ethers");
 const utils_1 = require("../../utils");
+const auth_1 = require("../../utils/auth");
+const env_1 = require("../../utils/env");
 const signatures_1 = require("../../utils/signatures");
+const TOPRF_PUBLIC_KEY = (0, env_1.getEnvVariable)('TOPRF_PUBLIC_KEY');
 const init = async (initRequest, { client }) => {
+    var _a;
     if (client.isInitialised) {
         throw utils_1.AttestorError.badRequest('Client already initialised');
     }
@@ -13,9 +18,19 @@ const init = async (initRequest, { client }) => {
     if (initRequest.clientVersion <= 0) {
         throw utils_1.AttestorError.badRequest('Unsupported client version');
     }
+    await (0, auth_1.assertValidAuthRequest)(initRequest.auth, initRequest.signatureType);
+    if ((_a = initRequest.auth) === null || _a === void 0 ? void 0 : _a.data) {
+        client.logger = client.logger.child({
+            userId: initRequest.auth.data.id
+        });
+    }
     client.metadata = initRequest;
     client.isInitialised = true;
-    return {};
+    return {
+        toprfPublicKey: TOPRF_PUBLIC_KEY
+            ? ethers_1.ethers.utils.arrayify(TOPRF_PUBLIC_KEY)
+            : new Uint8Array()
+    };
 };
 exports.init = init;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvaW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxxQ0FBeUM7QUFDekMscURBQWlEO0FBRTFDLE1BQU0sSUFBSSxHQUF1QixLQUFLLEVBQzVDLFdBQVcsRUFDWCxFQUFFLE1BQU0sRUFBRSxFQUNULEVBQUU7SUFDSCxJQUFHLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QixNQUFNLHFCQUFhLENBQUMsVUFBVSxDQUFDLDRCQUE0QixDQUFDLENBQUE7SUFDN0QsQ0FBQztJQUVELElBQUcsQ0FBQyx1QkFBVSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1FBQzNDLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsSUFBRyxXQUFXLENBQUMsYUFBYSxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ25DLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsR0FBRyxXQUFXLENBQUE7SUFDN0IsTUFBTSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUE7SUFFM0IsT0FBTyxFQUFFLENBQUE7QUFDVixDQUFDLENBQUE7QUFwQlksUUFBQSxJQUFJLFFBb0JoQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvaW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBK0I7QUFFL0IscUNBQXlDO0FBQ3pDLHlDQUF1RDtBQUN2RCx1Q0FBOEM7QUFDOUMscURBQWlEO0FBRWpELE1BQU0sZ0JBQWdCLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGtCQUFrQixDQUFDLENBQUE7QUFFcEQsTUFBTSxJQUFJLEdBQXVCLEtBQUssRUFDNUMsV0FBVyxFQUNYLEVBQUUsTUFBTSxFQUFFLEVBQ1QsRUFBRTs7SUFDSCxJQUFHLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QixNQUFNLHFCQUFhLENBQUMsVUFBVSxDQUFDLDRCQUE0QixDQUFDLENBQUE7SUFDN0QsQ0FBQztJQUVELElBQUcsQ0FBQyx1QkFBVSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1FBQzNDLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsSUFBRyxXQUFXLENBQUMsYUFBYSxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ25DLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsTUFBTSxJQUFBLDZCQUFzQixFQUMzQixXQUFXLENBQUMsSUFBSSxFQUNoQixXQUFXLENBQUMsYUFBYSxDQUN6QixDQUFBO0lBRUQsSUFBRyxNQUFBLFdBQVcsQ0FBQyxJQUFJLDBDQUFFLElBQUksRUFBRSxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7WUFDbkMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7U0FDaEMsQ0FBQyxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLEdBQUcsV0FBVyxDQUFBO0lBQzdCLE1BQU0sQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFBO0lBRTNCLE9BQU87UUFDTixjQUFjLEVBQUUsZ0JBQWdCO1lBQy9CLENBQUMsQ0FBQyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQztZQUN6QyxDQUFDLENBQUMsSUFBSSxVQUFVLEVBQUU7S0FDbkIsQ0FBQTtBQUNGLENBQUMsQ0FBQTtBQW5DWSxRQUFBLElBQUksUUFtQ2hCIn0=

package/lib/server/handlers/toprf.d.ts

@@ -0,0 +1,2 @@
+import { RPCHandler } from '../../types';
+export declare const toprf: RPCHandler<'toprf'>;

package/lib/server/handlers/toprf.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toprf = void 0;
+const ethers_1 = require("ethers");
+const utils_1 = require("../../utils");
+const env_1 = require("../../utils/env");
+const toprf = async ({ maskedData, engine }, { logger }) => {
+    const PRIVATE_KEY_STR = (0, env_1.getEnvVariable)('TOPRF_SHARE_PRIVATE_KEY');
+    const PUBLIC_KEY_STR = (0, env_1.getEnvVariable)('TOPRF_SHARE_PUBLIC_KEY');
+    if (!PRIVATE_KEY_STR || !PUBLIC_KEY_STR) {
+        throw new Error('private/public keys not set. Cannot execute OPRF');
+    }
+    const PRIVATE_KEY = ethers_1.ethers.utils.arrayify(PRIVATE_KEY_STR);
+    const PUBLIC_KEY = ethers_1.ethers.utils.arrayify(PUBLIC_KEY_STR);
+    const engineStr = (0, utils_1.getEngineString)(engine);
+    const operator = (0, utils_1.makeDefaultOPRFOperator)('chacha20', engineStr, logger);
+    const res = await operator.evaluateOPRF(PRIVATE_KEY, maskedData);
+    return { ...res, publicKeyShare: PUBLIC_KEY };
+};
+exports.toprf = toprf;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9wcmYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL2hhbmRsZXJzL3RvcHJmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUErQjtBQUUvQixxQ0FBb0U7QUFDcEUsdUNBQThDO0FBRXZDLE1BQU0sS0FBSyxHQUF3QixLQUFLLEVBQzlDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUN0QixFQUFFLE1BQU0sRUFBRSxFQUNULEVBQUU7SUFDSCxNQUFNLGVBQWUsR0FBRyxJQUFBLG9CQUFjLEVBQUMseUJBQXlCLENBQUMsQ0FBQTtJQUNqRSxNQUFNLGNBQWMsR0FBRyxJQUFBLG9CQUFjLEVBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUMvRCxJQUFHLENBQUMsZUFBZSxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDeEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFBO0lBQ3BFLENBQUM7SUFFRCxNQUFNLFdBQVcsR0FBRyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUMxRCxNQUFNLFVBQVUsR0FBRyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUV4RCxNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFlLEVBQUMsTUFBTSxDQUFDLENBQUE7SUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBQSwrQkFBdUIsRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBQ3ZFLE1BQU0sR0FBRyxHQUFHLE1BQU0sUUFBUSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUE7SUFFaEUsT0FBTyxFQUFFLEdBQUcsR0FBRyxFQUFFLGNBQWMsRUFBRSxVQUFVLEVBQUUsQ0FBQTtBQUM5QyxDQUFDLENBQUE7QUFsQlksUUFBQSxLQUFLLFNBa0JqQiJ9

package/lib/server/socket.d.ts

@@ -1,11 +1,13 @@
-import { IncomingMessage } from 'http';
-import { IAttestorServerSocket, Logger } from '../types';
+import { TunnelMessage } from '../proto/api';
+import { AcceptNewConnectionOpts, BGPListener, IAttestorServerSocket } from '../types';
 import { AttestorSocket } from '../utils/socket-base';
 import { WebSocket as WS } from 'ws';
 export declare class AttestorServerSocket extends AttestorSocket implements IAttestorServerSocket {
     sessionId: number;
+    bgpListener: BGPListener | undefined;
     tunnels: IAttestorServerSocket['tunnels'];
     private constructor();
     getTunnel(tunnelId: number): import("../types").Tunnel<import("../types").TCPSocketProperties>;
-    static acceptConnection(socket: WS, req: IncomingMessage, logger: Logger): Promise<AttestorServerSocket | undefined>;
+    removeTunnel(tunnelId: TunnelMessage['tunnelId']): void;
+    static acceptConnection(socket: WS, { req, logger, bgpListener }: AcceptNewConnectionOpts): Promise<AttestorServerSocket | undefined>;
 }

package/lib/server/socket.js

@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttestorServerSocket = void 0;
 const message_handler_1 = require("../client/utils/message-handler");
 const handlers_1 = require("../server/handlers");
+const apm_1 = require("../server/utils/apm");
 const generics_1 = require("../server/utils/generics");
 const utils_1 = require("../utils");
 const socket_base_1 = require("../utils/socket-base");
 const util_1 = require("util");
 class AttestorServerSocket extends socket_base_1.AttestorSocket {
-    constructor(socket, sessionId, logger) {
+    constructor(socket, sessionId, bgpListener, logger) {
         // @ts-ignore
         super(socket, {}, logger);
         this.sessionId = sessionId;
+        this.bgpListener = bgpListener;
         this.tunnels = {};
         // handle RPC requests
         this.addEventListener('rpc-request', handleRpcRequest.bind(this));
@@ -22,7 +24,7 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
         this.addEventListener('connection-terminated', () => {
             for (const tunnelId in this.tunnels) {
                 const tunnel = this.tunnels[tunnelId];
-                tunnel.close(new Error('WS session terminated'));
+                void tunnel.close(new Error('WS session terminated'));
             }
         });
     }
@@ -33,14 +35,17 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
         }
         return tunnel;
     }
-    static async acceptConnection(socket, req, logger) {
+    removeTunnel(tunnelId) {
+        delete this.tunnels[tunnelId];
+    }
+    static async acceptConnection(socket, { req, logger, bgpListener }) {
         // promisify ws.send -- so the sendMessage method correctly
         // awaits the send operation
         const bindSend = socket.send.bind(socket);
         socket.send = (0, util_1.promisify)(bindSend);
         const sessionId = (0, utils_1.generateSessionId)();
         logger = logger.child({ sessionId });
-        const client = new AttestorServerSocket(socket, sessionId, logger);
+        const client = new AttestorServerSocket(socket, sessionId, bgpListener, logger);
         try {
             const initMsgs = (0, generics_1.getInitialMessagesFromQuery)(req);
             logger.trace({ initMsgs: initMsgs.length }, 'new connection, validating...');
@@ -52,7 +57,7 @@ class AttestorServerSocket extends socket_base_1.AttestorSocket {
         catch (err) {
             logger.error({ err }, 'error in new connection');
             if (client.isOpen) {
-                client.terminateConnection(err instanceof utils_1.AttestorError
+                await client.terminateConnection(err instanceof utils_1.AttestorError
                     ? err
                     : utils_1.AttestorError.badRequest(err.message));
             }
@@ -76,20 +81,35 @@ async function handleTunnelMessage({ data: { tunnelId, message } }) {
     }
 }
 async function handleRpcRequest({ data: { data, requestId, respond, type } }) {
+    var _a, _b;
     const logger = this.logger.child({
         rpc: type,
         requestId
     });
+    const apm = (0, apm_1.getApm)();
+    const tx = apm === null || apm === void 0 ? void 0 : apm.startTransaction(type);
+    tx === null || tx === void 0 ? void 0 : tx.setLabel('requestId', requestId);
+    tx === null || tx === void 0 ? void 0 : tx.setLabel('sessionId', this.sessionId.toString());
+    const userId = (_b = (_a = this.metadata.auth) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.id;
+    if (userId) {
+        tx === null || tx === void 0 ? void 0 : tx.setLabel('authUserId', userId);
+    }
     try {
         logger.debug({ data }, 'handling RPC request');
         const handler = handlers_1.HANDLERS[type];
-        const res = await handler(data, { client: this, logger });
-        await respond(res);
+        const res = await handler(data, { client: this, logger, tx });
+        respond(res);
         logger.debug({ res }, 'handled RPC request');
+        tx === null || tx === void 0 ? void 0 : tx.setOutcome('success');
     }
     catch (err) {
         logger.error({ err }, 'error in RPC request');
         respond(utils_1.AttestorError.fromError(err));
+        tx === null || tx === void 0 ? void 0 : tx.setOutcome('failure');
+        apm === null || apm === void 0 ? void 0 : apm.captureError(err, { parent: tx });
+    }
+    finally {
+        tx === null || tx === void 0 ? void 0 : tx.end();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9zb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0Esc0VBQWdFO0FBQ2hFLGtEQUE4QztBQUM5Qyx3REFBdUU7QUFFdkUscUNBQTREO0FBQzVELHVEQUFzRDtBQUN0RCwrQkFBZ0M7QUFHaEMsTUFBYSxvQkFBcUIsU0FBUSw0QkFBYztJQUl2RCxZQUFvQixNQUFVLEVBQVMsU0FBaUIsRUFBRSxNQUFjO1FBQ3ZFLGFBQWE7UUFDYixLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUZhLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFGeEQsWUFBTyxHQUFxQyxFQUFFLENBQUE7UUFLN0Msc0JBQXNCO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7UUFDakUsNENBQTRDO1FBQzVDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtRQUN2RSxzREFBc0Q7UUFDdEQsZ0RBQWdEO1FBQ2hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyx1QkFBdUIsRUFBRSxHQUFHLEVBQUU7WUFDbkQsS0FBSSxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3BDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7Z0JBQ3JDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxDQUFBO1lBQ2pELENBQUM7UUFDRixDQUFDLENBQUMsQ0FBQTtJQUNILENBQUM7SUFFRCxTQUFTLENBQUMsUUFBZ0I7UUFDekIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9zb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQWdFO0FBRWhFLGtEQUE4QztBQUM5Qyw4Q0FBNkM7QUFDN0Msd0RBQXVFO0FBRXZFLHFDQUE0RDtBQUM1RCx1REFBc0Q7QUFDdEQsK0JBQWdDO0FBR2hDLE1BQWEsb0JBQXFCLFNBQVEsNEJBQWM7SUFJdkQsWUFDQyxNQUFVLEVBQ0gsU0FBaUIsRUFDakIsV0FBb0MsRUFDM0MsTUFBYztRQUVkLGFBQWE7UUFDYixLQUFLLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUxsQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBQ2pCLGdCQUFXLEdBQVgsV0FBVyxDQUF5QjtRQUw1QyxZQUFPLEdBQXFDLEVBQUUsQ0FBQTtRQVU3QyxzQkFBc0I7UUFDdEIsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGFBQWEsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtRQUNqRSw0Q0FBNEM7UUFDNUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGdCQUFnQixFQUFFLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO1FBQ3ZFLHNEQUFzRDtRQUN0RCxnREFBZ0Q7UUFDaEQsSUFBSSxDQUFDLGdCQUFnQixDQUFDLHVCQUF1QixFQUFFLEdBQUcsRUFBRTtZQUNuRCxLQUFJLE1BQU0sUUFBUSxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDcEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtnQkFDckMsS0FBSyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUMsQ0FBQTtZQUN0RCxDQUFDO1FBQ0YsQ0FBQyxDQUFDLENBQUE7SUFDSCxDQUFDO0lBRUQsU0FBUyxDQUFDLFFBQWdCO1FBQ3pCLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDckMsSUFBRyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ1osTUFBTSxJQUFJLHFCQUFhLENBQ3RCLGlCQUFpQixFQUNqQixXQUFXLFFBQVEsYUFBYSxDQUNoQyxDQUFBO1FBQ0YsQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFBO0lBQ2QsQ0FBQztJQUVELFlBQVksQ0FBQyxRQUFtQztRQUMvQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDOUIsQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQzVCLE1BQVUsRUFDVixFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUEyQjtRQUVyRCwyREFBMkQ7UUFDM0QsNEJBQTRCO1FBQzVCLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsSUFBQSxnQkFBUyxFQUFDLFFBQVEsQ0FBQyxDQUFBO1FBRWpDLE1BQU0sU0FBUyxHQUFHLElBQUEseUJBQWlCLEdBQUUsQ0FBQTtRQUNyQyxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7UUFFcEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxvQkFBb0IsQ0FDdEMsTUFBTSxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsTUFBTSxDQUN0QyxDQUFBO1FBQ0QsSUFBSSxDQUFDO1lBQ0osTUFBTSxRQUFRLEdBQUcsSUFBQSxzQ0FBMkIsRUFBQyxHQUFHLENBQUMsQ0FBQTtZQUNqRCxNQUFNLENBQUMsS0FBSyxDQUNYLEVBQUUsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLEVBQUUsRUFDN0IsK0JBQStCLENBQy9CLENBQUE7WUFDRCxLQUFJLE1BQU0sR0FBRyxJQUFJLFFBQVEsRUFBRSxDQUFDO2dCQUMzQixNQUFNLCtCQUFhLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUN0QyxDQUFDO1lBRUQsTUFBTSxDQUFDLEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO1FBQ3BDLENBQUM7UUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO1lBQ2IsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLHlCQUF5QixDQUFDLENBQUE7WUFDaEQsSUFBRyxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ2xCLE1BQU0sTUFBTSxDQUFDLG1CQUFtQixDQUMvQixHQUFHLFlBQVkscUJBQWE7b0JBQzNCLENBQUMsQ0FBQyxHQUFHO29CQUNMLENBQUMsQ0FBQyxxQkFBYSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQ3hDLENBQUE7WUFDRixDQUFDO1lBRUQsT0FBTTtRQUNQLENBQUM7UUFFRCxPQUFPLE1BQU0sQ0FBQTtJQUNkLENBQUM7Q0FDRDtBQW5GRCxvREFtRkM7QUFFRCxLQUFLLFVBQVUsbUJBQW1CLENBRWpDLEVBQUUsSUFBSSxFQUFFLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxFQUE4Qjs7SUFFM0QsSUFBSSxDQUFDO1FBQ0osTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxNQUFNLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUFDLE9BQU0sR0FBRyxFQUFFLENBQUM7UUFDYixNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLEtBQUssQ0FDakI7WUFDQyxHQUFHO1lBQ0gsUUFBUTtTQUNSLEVBQ0QseUJBQXlCLENBQ3pCLENBQUE7SUFDRixDQUFDO0FBQ0YsQ0FBQztBQUVELEtBQUssVUFBVSxnQkFBZ0IsQ0FFOUIsRUFBRSxJQUFJLEVBQUUsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsRUFBMkI7O0lBRXJFLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO1FBQ2hDLEdBQUcsRUFBRSxJQUFJO1FBQ1QsU0FBUztLQUNULENBQUMsQ0FBQTtJQUVGLE1BQU0sR0FBRyxHQUFHLElBQUEsWUFBTSxHQUFFLENBQUE7SUFDcEIsTUFBTSxFQUFFLEdBQUcsR0FBRyxhQUFILEdBQUcsdUJBQUgsR0FBRyxDQUFFLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3RDLEVBQUUsYUFBRixFQUFFLHVCQUFGLEVBQUUsQ0FBRSxRQUFRLENBQUMsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQ3BDLEVBQUUsYUFBRixFQUFFLHVCQUFGLEVBQUUsQ0FBRSxRQUFRLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtJQUVwRCxNQUFNLE1BQU0sR0FBRyxNQUFBLE1BQUEsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLDBDQUFFLElBQUksMENBQUUsRUFBRSxDQUFBO0lBQzNDLElBQUcsTUFBTSxFQUFFLENBQUM7UUFDWCxFQUFFLGFBQUYsRUFBRSx1QkFBRixFQUFFLENBQUUsUUFBUSxDQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUNuQyxDQUFDO0lBRUQsSUFBSSxDQUFDO1FBQ0osTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUE7UUFFOUMsTUFBTSxPQUFPLEdBQUcsbUJBQVEsQ0FBQyxJQUFJLENBQTRCLENBQUE7UUFDekQsTUFBTSxHQUFHLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxFQUFFLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUM3RCxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7UUFFWixNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLEVBQUUscUJBQXFCLENBQUMsQ0FBQTtRQUM1QyxFQUFFLGFBQUYsRUFBRSx1QkFBRixFQUFFLENBQUUsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQzFCLENBQUM7SUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2IsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLHNCQUFzQixDQUFDLENBQUE7UUFDN0MsT0FBTyxDQUFDLHFCQUFhLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUE7UUFDckMsRUFBRSxhQUFGLEVBQUUsdUJBQUYsRUFBRSxDQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUV6QixHQUFHLGFBQUgsR0FBRyx1QkFBSCxHQUFHLENBQUUsWUFBWSxDQUFDLEdBQUcsRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZDLENBQUM7WUFBUyxDQUFDO1FBQ1YsRUFBRSxhQUFGLEVBQUUsdUJBQUYsRUFBRSxDQUFFLEdBQUcsRUFBRSxDQUFBO0lBQ1YsQ0FBQztBQUNGLENBQUMifQ==

package/lib/server/tunnels/make-tcp-tunnel.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeTcpTunnel = void 0;
-const dns_1 = require("dns");
 const https_proxy_agent_1 = require("https-proxy-agent");
 const net_1 = require("net");
 const config_1 = require("../../config");
+const dns_1 = require("../../server/utils/dns");
 const iso_1 = require("../../server/utils/iso");
 const utils_1 = require("../../utils");
 const env_1 = require("../../utils/env");
@@ -24,13 +24,19 @@ const HTTPS_PROXY_URL = (0, env_1.getEnvVariable)('HTTPS_PROXY_URL');
 const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
     const transcript = [];
     const socket = await connectTcp({ ...opts, logger });
-    socket.once('error', close);
-    socket.once('end', () => close(undefined));
+    let closed = false;
     socket.on('data', message => {
+        if (closed) {
+            logger.warn('socket is closed, dropping message');
+            return;
+        }
         onMessage === null || onMessage === void 0 ? void 0 : onMessage(message);
         transcript.push({ sender: 'server', message });
     });
+    socket.once('error', onSocketClose);
+    socket.once('close', () => onSocketClose(undefined));
     return {
+        socket,
         transcript,
         createRequest: opts,
         async write(data) {
@@ -46,22 +52,24 @@ const makeTcpTunnel = async ({ onClose, onMessage, logger, ...opts }) => {
                 });
             });
         },
-        close,
+        close(err) {
+            if (closed) {
+                return;
+            }
+            socket.destroy(err);
+        }
     };
-    function close(error) {
-        if (socket.readableEnded) {
+    function onSocketClose(err) {
+        if (closed) {
             return;
         }
-        logger.debug({ err: error }, 'closing socket');
-        socket.end(() => {
-            // Do nothing
-        });
-        onClose === null || onClose === void 0 ? void 0 : onClose(error);
+        logger.debug({ err }, 'closing socket');
+        closed = true;
+        onClose === null || onClose === void 0 ? void 0 : onClose(err);
         onClose = undefined;
     }
 };
 exports.makeTcpTunnel = makeTcpTunnel;
-setDnsServers();
 async function connectTcp({ host, port, geoLocation, logger }) {
     let connectTimeout;
     let socket;
@@ -112,7 +120,7 @@ async function getSocket(opts) {
             || ((_a = err.data) === null || _a === void 0 ? void 0 : _a.code) !== 403) {
             throw err;
         }
-        const addrs = await resolveHostnames(opts.host);
+        const addrs = await (0, dns_1.resolveHostnames)(opts.host);
         logger.info({ addrs, host: opts.host }, 'failed to connect due to restricted IP, trying via raw addr');
         for (const addr of addrs) {
             try {
@@ -164,19 +172,4 @@ async function _getSocket({ host, port, geoLocation, logger }) {
     });
     return proxySocket;
 }
-async function resolveHostnames(hostname) {
-    return new Promise((_resolve, reject) => {
-        (0, dns_1.resolve)(hostname, (err, addresses) => {
-            if (err) {
-                reject(new Error(`Could not resolve hostname: ${hostname}, ${err.message}`));
-            }
-            else {
-                _resolve(addresses);
-            }
-        });
-    });
-}
-function setDnsServers() {
-    (0, dns_1.setServers)(config_1.DNS_SERVERS);
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10Y3AtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90dW5uZWxzL21ha2UtdGNwLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2QkFBeUM7QUFDekMseURBQW1EO0FBRW5ELDZCQUE0QjtBQUM1Qix1Q0FBK0Q7QUFFL0QsOENBQXlEO0FBR3pELHFDQUF5QztBQUN6Qyx1Q0FBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGlCQUFpQixDQUFDLENBQUE7QUFLekQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSSxNQUFNLGFBQWEsR0FBaUQsS0FBSyxFQUFDLEVBQ2hGLE9BQU8sRUFDUCxTQUFTLEVBQ1QsTUFBTSxFQUNOLEdBQUcsSUFBSSxFQUNQLEVBQUUsRUFBRTtJQUNKLE1BQU0sVUFBVSxHQUFzQyxFQUFFLENBQUE7SUFDeEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXBELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO0lBQzFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxFQUFFO1FBQzNCLFNBQVMsYUFBVCxTQUFTLHVCQUFULFNBQVMsQ0FBRyxPQUFPLENBQUMsQ0FBQTtRQUNwQixVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQy9DLENBQUMsQ0FBQyxDQUFBO0lBRUYsT0FBTztRQUNOLFVBQVU7UUFDVixhQUFhLEVBQUUsSUFBSTtRQUNuQixLQUFLLENBQUMsS0FBSyxDQUFDLElBQUk7WUFDZixVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtZQUNwRCxNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO2dCQUMzQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsRUFBRTtvQkFDeEIsSUFBRyxHQUFHLEVBQUUsQ0FBQzt3QkFDUixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7b0JBQ1osQ0FBQzt5QkFBTSxDQUFDO3dCQUNQLE9BQU8sRUFBRSxDQUFBO29CQUNWLENBQUM7Z0JBQ0YsQ0FBQyxDQUFDLENBQUE7WUFDSCxDQUFDLENBQUMsQ0FBQTtRQUNILENBQUM7UUFDRCxLQUFLO0tBQ0wsQ0FBQTtJQUVELFNBQVMsS0FBSyxDQUFDLEtBQWE7UUFDM0IsSUFBRyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDekIsT0FBTTtRQUNQLENBQUM7UUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLGdCQUFnQixDQUFDLENBQUE7UUFFOUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7WUFDZixhQUFhO1FBQ2QsQ0FBQyxDQUFDLENBQUE7UUFDRixPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUcsS0FBSyxDQUFDLENBQUE7UUFDaEIsT0FBTyxHQUFHLFNBQVMsQ0FBQTtJQUNwQixDQUFDO0FBQ0YsQ0FBQyxDQUFBO0FBL0NZLFFBQUEsYUFBYSxpQkErQ3pCO0FBRUQsYUFBYSxFQUFFLENBQUE7QUFFZixLQUFLLFVBQVUsVUFBVSxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsTUFBTSxFQUFhO0lBQ3ZFLElBQUksY0FBMEMsQ0FBQTtJQUM5QyxJQUFJLE1BQTBCLENBQUE7SUFDOUIsSUFBSSxDQUFDO1FBQ0osTUFBTSxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO1lBQzFDLElBQUksQ0FBQztnQkFDSixzREFBc0Q7Z0JBQ3RELDBDQUEwQztnQkFDMUMsY0FBYyxHQUFHLFVBQVUsQ0FDMUIsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUNYLElBQUkscUJBQWEsQ0FDaEIscUJBQXFCLEVBQ3JCLDZCQUE2QixDQUM3QixDQUNELEVBQ0QsOEJBQXFCLENBQ3JCLENBQUE7Z0JBQ0QsTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFDO29CQUN4QixJQUFJO29CQUNKLElBQUk7b0JBQ0osV0FBVztvQkFDWCxNQUFNO2lCQUNOLENBQUMsQ0FBQTtnQkFDRixNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsQ0FBQTtnQkFDL0IsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUE7Z0JBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQ3hCLE1BQU0sQ0FDTCxJQUFJLHFCQUFhLENBQ2hCLHFCQUFxQixFQUNyQixtQkFBbUIsQ0FDbkIsQ0FDRCxDQUNELENBQUMsQ0FBQTtZQUNILENBQUM7WUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO2dCQUNiLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNaLENBQUM7UUFDRixDQUFDLENBQUMsQ0FBQTtRQUVGLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxJQUFJLEVBQUUsR0FBRyxJQUFJLElBQUksSUFBSSxFQUFFLEVBQUUsRUFBRSxXQUFXLENBQUMsQ0FBQTtRQUV0RCxPQUFPLE1BQU8sQ0FBQTtJQUNmLENBQUM7SUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2IsTUFBTSxhQUFOLE1BQU0sdUJBQU4sTUFBTSxDQUFFLEdBQUcsRUFBRSxDQUFBO1FBQ2IsTUFBTSxHQUFHLENBQUE7SUFDVixDQUFDO1lBQVMsQ0FBQztRQUNWLFlBQVksQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUM3QixDQUFDO0FBQ0YsQ0FBQztBQUVELEtBQUssVUFBVSxTQUFTLENBQUMsSUFBZTs7SUFDdkMsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQTtJQUN2QixJQUFJLENBQUM7UUFDSixPQUFPLE1BQU0sVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzlCLENBQUM7SUFBQyxPQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2IsOENBQThDO1FBQzlDLG9DQUFvQztRQUNwQyx1Q0FBdUM7UUFDdkMsa0NBQWtDO1FBQ2xDLHFEQUFxRDtRQUNyRCxJQUNDLENBQUMsQ0FBQyxHQUFHLFlBQVkscUJBQWEsQ0FBQztlQUM1QixDQUFBLE1BQUEsR0FBRyxDQUFDLElBQUksMENBQUUsSUFBSSxNQUFLLEdBQUcsRUFDeEIsQ0FBQztZQUNGLE1BQU0sR0FBRyxDQUFBO1FBQ1YsQ0FBQztRQUVELE1BQU0sS0FBSyxHQUFHLE1BQU0sZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQy9DLE1BQU0sQ0FBQyxJQUFJLENBQ1YsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsRUFDMUIsNkRBQTZELENBQzdELENBQUE7UUFFRCxLQUFJLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ3pCLElBQUksQ0FBQztnQkFDSixPQUFPLE1BQU0sVUFBVSxDQUFDLEVBQUUsR0FBRyxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7WUFDakQsQ0FBQztZQUFDLE9BQU0sR0FBRyxFQUFFLENBQUM7Z0JBQ2IsTUFBTSxDQUFDLEtBQUssQ0FDWCxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDYiwyQkFBMkIsQ0FDM0IsQ0FBQTtZQUNGLENBQUM7UUFDRixDQUFDO1FBRUQsTUFBTSxHQUFHLENBQUE7SUFDVixDQUFDO0FBQ0YsQ0FBQztBQUVELEtBQUssVUFBVSxVQUFVLENBQ3hCLEVBQ0MsSUFBSSxFQUNKLElBQUksRUFDSixXQUFXLEVBQ1gsTUFBTSxFQUNLO0lBRVosTUFBTSxNQUFNLEdBQUcsSUFBSSxZQUFNLEVBQUUsQ0FBQTtJQUMzQixJQUFHLFdBQVcsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ3BDLE1BQU0sQ0FBQyxJQUFJLENBQ1YsRUFBRSxXQUFXLEVBQUUsRUFDZiw2Q0FBNkMsQ0FDN0MsQ0FBQTtRQUNELFdBQVcsR0FBRyxFQUFFLENBQUE7SUFDakIsQ0FBQztJQUVELElBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNqQixNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksR0FBRyxDQUFDLENBQUE7UUFDL0IsT0FBTyxNQUFNLENBQUE7SUFDZCxDQUFDO0lBRUQsSUFBRyxDQUFDLElBQUEsd0JBQWtCLEVBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztRQUNyQyxNQUFNLHFCQUFhLENBQUMsVUFBVSxDQUM3QixnQkFBZ0IsV0FBVyxpREFBaUQsRUFDNUUsRUFBRSxXQUFXLEVBQUUsQ0FDZixDQUFBO0lBQ0YsQ0FBQztJQUVELE1BQU0sUUFBUSxHQUFHLGVBQWdCLENBQUMsT0FBTyxDQUN4QyxpQkFBaUIsRUFDakIsQ0FBQSxXQUFXLGFBQVgsV0FBVyx1QkFBWCxXQUFXLENBQUUsV0FBVyxFQUFFLEtBQUksRUFBRSxDQUNoQyxDQUFBO0lBRUQsTUFBTSxLQUFLLEdBQUcsSUFBSSxtQ0FBZSxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzNDLE1BQU0sZUFBZSxHQUFHLElBQUksT0FBTyxDQUFrQixPQUFPLENBQUMsRUFBRTtRQUM5RCxhQUFhO1FBQ2IsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDckMsQ0FBQyxDQUFDLENBQUE7SUFFRixNQUFNLFdBQVcsR0FBRyxNQUFNLEtBQUssQ0FBQyxPQUFPO0lBQ3RDLG9DQUFvQztJQUNwQyxpQ0FBaUM7SUFDakMsYUFBYTtJQUNiLE1BQU0sRUFDTixFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLDhCQUFxQixFQUFFLENBQzlDLENBQUE7SUFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLGVBQWUsQ0FBQTtJQUNqQyxJQUFHLEdBQUcsQ0FBQyxVQUFVLEtBQUssR0FBRyxFQUFFLENBQUM7UUFDM0IsTUFBTSxDQUFDLEtBQUssQ0FDWCxFQUFFLFdBQVcsRUFBRSxHQUFHLEVBQUUsRUFDcEIsMkJBQTJCLENBQzNCLENBQUE7UUFDRCxNQUFNLElBQUkscUJBQWEsQ0FDdEIsbUJBQW1CLEVBQ25CLDJCQUEyQixXQUFXLDhCQUE4QixHQUFHLENBQUMsVUFBVSxjQUFjLEdBQUcsQ0FBQyxVQUFVLEVBQUUsRUFDaEg7WUFDQyxJQUFJLEVBQUUsR0FBRyxDQUFDLFVBQVU7WUFDcEIsT0FBTyxFQUFFLEdBQUcsQ0FBQyxVQUFVO1NBQ3ZCLENBQ0QsQ0FBQTtJQUNGLENBQUM7SUFFRCxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUcsRUFBRTtRQUNyQixrQ0FBa0M7UUFDbEMsc0NBQXNDO1FBQ3RDLFdBQVcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUE7SUFDNUIsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLFdBQVcsQ0FBQTtBQUNuQixDQUFDO0FBRUQsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFFBQWdCO0lBQy9DLE9BQU8sSUFBSSxPQUFPLENBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDakQsSUFBQSxhQUFPLEVBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxFQUFFO1lBQ3BDLElBQUcsR0FBRyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUNMLElBQUksS0FBSyxDQUNSLCtCQUErQixRQUFRLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUN6RCxDQUNELENBQUE7WUFDRixDQUFDO2lCQUFNLENBQUM7Z0JBQ1AsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3BCLENBQUM7UUFDRixDQUFDLENBQUMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMsYUFBYTtJQUNyQixJQUFBLGdCQUFVLEVBQUMsb0JBQVcsQ0FBQyxDQUFBO0FBQ3hCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZS10Y3AtdHVubmVsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90dW5uZWxzL21ha2UtdGNwLXR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBbUQ7QUFFbkQsNkJBQTRCO0FBQzVCLHVDQUFrRDtBQUVsRCw4Q0FBdUQ7QUFDdkQsOENBQXlEO0FBR3pELHFDQUF5QztBQUN6Qyx1Q0FBOEM7QUFFOUMsTUFBTSxlQUFlLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGlCQUFpQixDQUFDLENBQUE7QUFLekQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSSxNQUFNLGFBQWEsR0FBaUQsS0FBSyxFQUFDLEVBQ2hGLE9BQU8sRUFDUCxTQUFTLEVBQ1QsTUFBTSxFQUNOLEdBQUcsSUFBSSxFQUNQLEVBQUUsRUFBRTtJQUNKLE1BQU0sVUFBVSxHQUFzQyxFQUFFLENBQUE7SUFDeEQsTUFBTSxNQUFNLEdBQUcsTUFBTSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFBO0lBRXBELElBQUksTUFBTSxHQUFHLEtBQUssQ0FBQTtJQUdsQixNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsRUFBRTtRQUMzQixJQUFHLE1BQU0sRUFBRSxDQUFDO1lBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFBO1lBQ2pELE9BQU07UUFDUCxDQUFDO1FBRUQsU0FBUyxhQUFULFNBQVMsdUJBQVQsU0FBUyxDQUFHLE9BQU8sQ0FBQyxDQUFBO1FBQ3BCLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7SUFDL0MsQ0FBQyxDQUFDLENBQUE7SUFFRixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxhQUFhLENBQUMsQ0FBQTtJQUNuQyxNQUFNLENBQUMsSUFBSSxDQUFDLE9B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

package/lib/server/utils/apm.js

@@ -18,8 +18,10 @@ let apm;
  * here: https://www.elastic.co/guide/en/apm/agent/nodejs/current/custom-stack.html#custom-stack-advanced-configuration
  */
 function getApm() {
-    if (!(0, env_1.getEnvVariable)('ELASTIC_APM_SERVER_URL') || !(0, env_1.getEnvVariable)('ELASTIC_APM_SECRET_TOKEN')) {
-        logger_1.logger.info('ELASTIC_APM_SERVER_URL or ELASTIC_APM_SECRET_TOKEN no found in env APM agent not initialised');
+    if (!(0, env_1.getEnvVariable)('ELASTIC_APM_SERVER_URL')
+        || !(0, env_1.getEnvVariable)('ELASTIC_APM_SECRET_TOKEN')) {
+        logger_1.logger.info('ELASTIC_APM_SERVER_URL or ELASTIC_APM_SECRET_TOKEN not found'
+            + ' in env, APM agent not initialised');
         return undefined;
     }
     if (!apm) {
@@ -27,13 +29,15 @@ function getApm() {
             || '0.1');
         apm = elastic_apm_node_1.default.start({
             serviceName: 'reclaim_attestor',
-            serviceVersion: '2.0.0',
+            serviceVersion: '4.0.0',
             transactionSampleRate: sampleRate,
-            instrumentIncomingHTTPRequests: false,
+            instrumentIncomingHTTPRequests: true,
+            usePathAsTransactionName: true,
             instrument: true,
+            captureHeaders: true,
         });
         logger_1.logger.info('initialised APM agent');
     }
     return apm;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci91dGlscy9hcG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFlQSx3QkFzQkM7QUFyQ0Qsd0VBQW9EO0FBQ3BELHVDQUE4QztBQUM5Qyw2Q0FBeUM7QUFFekMsSUFBSSxHQUFzQixDQUFBO0FBRTFCOzs7Ozs7OztHQVFHO0FBQ0gsU0FBZ0IsTUFBTTtJQUNyQixJQUFHLENBQUMsSUFBQSxvQkFBYyxFQUFDLHdCQUF3QixDQUFDLElBQUksQ0FBQyxJQUFBLG9CQUFjLEVBQUMsMEJBQTBCLENBQUMsRUFBRSxDQUFDO1FBQzdGLGVBQU0sQ0FBQyxJQUFJLENBQUMsOEZBQThGLENBQUMsQ0FBQTtRQUMzRyxPQUFPLFNBQVMsQ0FBQTtJQUNqQixDQUFDO0lBRUQsSUFBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1QsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUNuQixJQUFBLG9CQUFjLEVBQUMseUJBQXlCLENBQUM7ZUFDdEMsS0FBSyxDQUNSLENBQUE7UUFDRCxHQUFHLEdBQUcsMEJBQVUsQ0FBQyxLQUFLLENBQUM7WUFDdEIsV0FBVyxFQUFFLGtCQUFrQjtZQUMvQixjQUFjLEVBQUUsT0FBTztZQUN2QixxQkFBcUIsRUFBRSxVQUFVO1lBQ2pDLDhCQUE4QixFQUFFLEtBQUs7WUFDckMsVUFBVSxFQUFFLElBQUk7U0FDaEIsQ0FBQyxDQUFBO1FBQ0YsZUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO0lBQ3JDLENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQTtBQUNYLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci91dGlscy9hcG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFlQSx3QkE4QkM7QUE3Q0Qsd0VBQW9EO0FBQ3BELHVDQUE4QztBQUM5Qyw2Q0FBeUM7QUFFekMsSUFBSSxHQUFzQixDQUFBO0FBRTFCOzs7Ozs7OztHQVFHO0FBQ0gsU0FBZ0IsTUFBTTtJQUNyQixJQUNDLENBQUMsSUFBQSxvQkFBYyxFQUFDLHdCQUF3QixDQUFDO1dBQ3RDLENBQUMsSUFBQSxvQkFBYyxFQUFDLDBCQUEwQixDQUFDLEVBQzdDLENBQUM7UUFDRixlQUFNLENBQUMsSUFBSSxDQUNWLDhEQUE4RDtjQUM1RCxvQ0FBb0MsQ0FDdEMsQ0FBQTtRQUNELE9BQU8sU0FBUyxDQUFBO0lBQ2pCLENBQUM7SUFFRCxJQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDVCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQ25CLElBQUEsb0JBQWMsRUFBQyx5QkFBeUIsQ0FBQztlQUN0QyxLQUFLLENBQ1IsQ0FBQTtRQUNELEdBQUcsR0FBRywwQkFBVSxDQUFDLEtBQUssQ0FBQztZQUN0QixXQUFXLEVBQUUsa0JBQWtCO1lBQy9CLGNBQWMsRUFBRSxPQUFPO1lBQ3ZCLHFCQUFxQixFQUFFLFVBQVU7WUFDakMsOEJBQThCLEVBQUUsSUFBSTtZQUNwQyx3QkFBd0IsRUFBRSxJQUFJO1lBQzlCLFVBQVUsRUFBRSxJQUFJO1lBQ2hCLGNBQWMsRUFBRSxJQUFJO1NBQ3BCLENBQUMsQ0FBQTtRQUNGLGVBQU0sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtJQUNyQyxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUE7QUFDWCxDQUFDIn0=

package/lib/server/utils/assert-valid-claim-request.d.ts

@@ -1,6 +1,6 @@
 import { ZKEngine } from '@reclaimprotocol/zk-symmetric-crypto';
 import { ClaimTunnelRequest, InitRequest, ProviderClaimInfo } from '../../proto/api';
-import { IDecryptedTranscript, Logger, TCPSocketProperties, Transcript } from '../../types';
+import { IDecryptedTranscript, Logger, ProviderCtx, TCPSocketProperties, Transcript } from '../../types';
 /**
  * Asserts that the claim request is valid.
  *
@@ -19,7 +19,7 @@ export declare function assertValidClaimRequest(request: ClaimTunnelRequest, met
  * Verify that the transcript contains a valid claim
  * for the provider.
  */
-export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T): Promise<T>;
+export declare function assertValidProviderTranscript<T extends ProviderClaimInfo>(applData: Transcript<Uint8Array>, info: T, logger: Logger, providerCtx: ProviderCtx): Promise<T>;
 /**
  * Verify that the transcript provided by the client
  * matches the transcript of the tunnel, the server
@@ -27,4 +27,4 @@ export declare function assertValidProviderTranscript<T extends ProviderClaimInf
  */
 export declare function assertTranscriptsMatch(clientTranscript: ClaimTunnelRequest['transcript'], tunnelTranscript: TCPSocketProperties['transcript']): void;
 export declare function decryptTranscript(transcript: ClaimTunnelRequest['transcript'], logger: Logger, zkEngine: ZKEngine, serverIV: Uint8Array, clientIV: Uint8Array): Promise<IDecryptedTranscript>;
-export declare function getWithoutHeader(message: Uint8Array): Uint8Array;
+export declare function getWithoutHeader(message: Uint8Array): Uint8Array<ArrayBuffer>;

package/lib/server/utils/assert-valid-claim-request.js

@@ -50,7 +50,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
     }
     // get all application data messages
     const applData = (0, utils_1.extractApplicationDataFromTranscript)(receipt);
-    const newData = await assertValidProviderTranscript(applData, data);
+    const newData = await assertValidProviderTranscript(applData, data, logger, { version: metadata.clientVersion });
     if (newData !== data) {
         logger.info({ newData }, 'updated claim info');
     }
@@ -60,7 +60,7 @@ async function assertValidClaimRequest(request, metadata, logger) {
  * Verify that the transcript contains a valid claim
  * for the provider.
  */
-async function assertValidProviderTranscript(applData, info) {
+async function assertValidProviderTranscript(applData, info, logger, providerCtx) {
     var _a;
     const providerName = info.provider;
     const provider = providers_1.providers[providerName];
@@ -70,16 +70,19 @@ async function assertValidProviderTranscript(applData, info) {
     const params = (0, generics_1.niceParseJsonObject)(info.parameters, 'params');
     const ctx = (0, generics_1.niceParseJsonObject)(info.context, 'context');
     (0, utils_1.assertValidateProviderParams)(providerName, params);
-    const rslt = await provider.assertValidProviderReceipt(applData, params);
+    const rslt = await provider.assertValidProviderReceipt({
+        receipt: applData,
+        params,
+        logger,
+        ctx: providerCtx
+    });
+    ctx.providerHash = (0, utils_1.hashProviderParams)(params);
     const extractedParameters = (rslt === null || rslt === void 0 ? void 0 : rslt.extractedParameters) || {};
-    if (!Object.keys(extractedParameters).length) {
-        return info;
+    if (Object.keys(extractedParameters).length) {
+        ctx.extractedParameters = extractedParameters;
     }
-    const newInfo = { ...info };
-    ctx.extractedParameters = extractedParameters;
-    ctx.providerHash = (0, utils_1.hashProviderParams)(params);
-    newInfo.context = (_a = (0, utils_1.canonicalStringify)(ctx)) !== null && _a !== void 0 ? _a : '';
-    return newInfo;
+    info.context = (_a = (0, utils_1.canonicalStringify)(ctx)) !== null && _a !== void 0 ? _a : '';
+    return info;
 }
 /**
  * Verify that the transcript provided by the client
@@ -117,7 +120,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
     let serverRecordNumber = clientRecordNumber;
     transcript = transcript.slice(nextMsgIndex);
     const decryptedTranscript = [];
-    for (const [i, { sender, message, reveal: { zkReveal, directReveal } = {} }] of transcript.entries()) { //start with first message after last handshake message
+    for (const [i, { sender, message, reveal: { zkReveal, directReveal } = {} }] of transcript.entries()) {
+        //start with first message after last handshake message
         await getDecryptedMessage(sender, message, directReveal, zkReveal, i);
     }
     return {
@@ -128,7 +132,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
     async function getDecryptedMessage(sender, message, directReveal, zkReveal, i) {
         var _a, _b;
         try {
-            const isServer = sender === api_1.TranscriptMessageSenderType.TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER;
+            const isServer = sender === api_1.TranscriptMessageSenderType
+                .TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER;
             const recordHeader = message.slice(0, 5);
             const content = getWithoutHeader(message);
             if (isServer) {
@@ -153,8 +158,13 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
                     logger,
                     cipherSuite,
                     zkEngine: zkEngine,
-                    iv: sender === api_1.TranscriptMessageSenderType.TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER ? serverIV : clientIV,
-                    recordNumber: isServer ? serverRecordNumber : clientRecordNumber
+                    iv: sender === api_1.TranscriptMessageSenderType
+                        .TRANSCRIPT_MESSAGE_SENDER_TYPE_SERVER
+                        ? serverIV
+                        : clientIV,
+                    recordNumber: isServer
+                        ? serverRecordNumber
+                        : clientRecordNumber
                 });
                 plaintext = result.redactedPlaintext;
                 redacted = false;
@@ -165,7 +175,8 @@ async function decryptTranscript(transcript, logger, zkEngine, serverIV, clientI
                 plaintextLength = plaintext.length;
             }
             decryptedTranscript.push({
-                sender: sender === api_1.TranscriptMessageSenderType.TRANSCRIPT_MESSAGE_SENDER_TYPE_CLIENT
+                sender: sender === api_1.TranscriptMessageSenderType
+                    .TRANSCRIPT_MESSAGE_SENDER_TYPE_CLIENT
                     ? 'client'
                     : 'server',
                 redacted,
@@ -186,4 +197,4 @@ function getWithoutHeader(message) {
     // strip the record header (xx 03 03 xx xx)
     return message.slice(5);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assert-valid-claim-request.js","sourceRoot":"","sources":["../../../src/server/utils/assert-valid-claim-request.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assert-valid-claim-request.js","sourceRoot":"","sources":["../../../src/server/utils/assert-valid-claim-request.ts"],"names":[],"mappings":"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"}

package/lib/server/utils/dns.d.ts

@@ -0,0 +1 @@
+export declare function resolveHostnames(hostname: string): Promise<string[]>;

package/lib/server/utils/dns.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveHostnames = resolveHostnames;
+const dns_1 = require("dns");
+const config_1 = require("../../config");
+setDnsServers();
+async function resolveHostnames(hostname) {
+    return new Promise((_resolve, reject) => {
+        (0, dns_1.resolve)(hostname, (err, addresses) => {
+            if (err) {
+                reject(new Error(`Could not resolve hostname: ${hostname}, ${err.message}`));
+            }
+            else {
+                _resolve(addresses);
+            }
+        });
+    });
+}
+function setDnsServers() {
+    (0, dns_1.setServers)(config_1.DNS_SERVERS);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci91dGlscy9kbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFLQSw0Q0FjQztBQW5CRCw2QkFBeUM7QUFDekMsdUNBQXdDO0FBRXhDLGFBQWEsRUFBRSxDQUFBO0FBRVIsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFFBQWdCO0lBQ3RELE9BQU8sSUFBSSxPQUFPLENBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUU7UUFDakQsSUFBQSxhQUFPLEVBQUMsUUFBUSxFQUFFLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxFQUFFO1lBQ3BDLElBQUcsR0FBRyxFQUFFLENBQUM7Z0JBQ1IsTUFBTSxDQUNMLElBQUksS0FBSyxDQUNSLCtCQUErQixRQUFRLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUN6RCxDQUNELENBQUE7WUFDRixDQUFDO2lCQUFNLENBQUM7Z0JBQ1AsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQ3BCLENBQUM7UUFDRixDQUFDLENBQUMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELFNBQVMsYUFBYTtJQUNyQixJQUFBLGdCQUFVLEVBQUMsb0JBQVcsQ0FBQyxDQUFBO0FBQ3hCLENBQUMifQ==

package/lib/server/utils/generics.d.ts

@@ -3,7 +3,7 @@ import { ServiceSignatureType } from '../../proto/api';
 /**
  * Sign message using the PRIVATE_KEY env var.
  */
-export declare function signAsAttestor(data: Uint8Array | string, scheme: ServiceSignatureType): Uint8Array | Promise<Uint8Array>;
+export declare function signAsAttestor(data: Uint8Array | string, scheme: ServiceSignatureType): Uint8Array<ArrayBufferLike> | Promise<Uint8Array<ArrayBufferLike>>;
 /**
  * Obtain the address on chain, from the PRIVATE_KEY env var.
  */

package/lib/tests/describe-with-server.d.ts

@@ -1,4 +1,3 @@
-import { ZKEngine } from '@reclaimprotocol/zk-symmetric-crypto';
 import { AttestorClient } from '../client/utils/client-socket';
 import { createMockServer } from '../tests/mock-provider-server';
 import { IAttestorServerSocket } from '../types';
@@ -12,7 +11,6 @@ type ServerOpts = {
     mockHttpsServer: ReturnType<typeof createMockServer>;
     mockhttpsServerPort: number;
     serverUrl: string;
-    zkEngine: ZKEngine;
 };
 /**
  * Boots up a attestor server, a mock https server,