@reclaimprotocol/attestor-core 4.0.3 → 5.0.1-beta.10

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

@@ -1,2 +1,2 @@
-import { RPCHandler } from '../../types';
+import type { RPCHandler } from '#src/types/index.ts';
 export declare const disconnectTunnel: RPCHandler<'disconnectTunnel'>;

package/lib/server/handlers/disconnectTunnel.js

@@ -1,10 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.disconnectTunnel = void 0;
 const disconnectTunnel = async ({ id }, { client }) => {
-    const tunnel = client.getTunnel(id);
-    await tunnel.close();
-    return {};
+  const tunnel = client.getTunnel(id);
+  await tunnel.close();
+  return {};
+};
+export {
+  disconnectTunnel
 };
-exports.disconnectTunnel = disconnectTunnel;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzY29ubmVjdFR1bm5lbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvZGlzY29ubmVjdFR1bm5lbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFTyxNQUFNLGdCQUFnQixHQUFtQyxLQUFLLEVBQ3BFLEVBQUUsRUFBRSxFQUFFLEVBQ04sRUFBRSxNQUFNLEVBQUUsRUFDVCxFQUFFO0lBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNuQyxNQUFNLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUVwQixPQUFPLEVBQUUsQ0FBQTtBQUNWLENBQUMsQ0FBQTtBQVJZLFFBQUEsZ0JBQWdCLG9CQVE1QiJ9

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

@@ -0,0 +1,2 @@
+import type { RPCHandler } from '#src/types/handlers.ts';
+export declare const fetchCertificateBytes: RPCHandler<'fetchCertificateBytes'>;

package/lib/server/handlers/fetchCertificateBytes.js

@@ -0,0 +1,57 @@
+import { concatenateUint8Arrays, loadX509FromPem } from "@reclaimprotocol/tls";
+import { CERT_ALLOWED_MIMETYPES, MAX_CERT_SIZE_BYTES } from "../../config/index.js";
+import { AttestorError } from "../../utils/error.js";
+const fetchCertificateBytes = async ({ url }) => {
+  const res = await fetch(url, {
+    redirect: "follow",
+    signal: AbortSignal.timeout(1e4)
+  });
+  if (!res.ok) {
+    res.body?.cancel("Not ok");
+    throw new AttestorError(
+      "ERROR_CERTIFICATE_FETCH_FAILED",
+      `Failed to fetch certificate from URL: ${url}, status: ${res.status}`
+    );
+  }
+  const contentType = res.headers.get("content-type");
+  if (!contentType || !CERT_ALLOWED_MIMETYPES.includes(contentType)) {
+    res.body?.cancel("Mismatch");
+    throw new AttestorError(
+      "ERROR_CERTIFICATE_FETCH_FAILED",
+      `Invalid content-type when fetching certificate from URL: ${url}, content-type: ${contentType}`
+    );
+  }
+  if (!res.body) {
+    throw new AttestorError(
+      "ERROR_CERTIFICATE_FETCH_FAILED",
+      `No body in response when fetching certificate from URL: ${url}`
+    );
+  }
+  let total = 0;
+  const byteArr = [];
+  for await (const chunk of res.body) {
+    total += chunk.length;
+    if (total > MAX_CERT_SIZE_BYTES) {
+      res.body.cancel("Too many bytes");
+      throw new AttestorError(
+        "ERROR_CERTIFICATE_FETCH_FAILED",
+        `Certificate size exceeds maximum limit of ${MAX_CERT_SIZE_BYTES}b`
+      );
+    }
+    byteArr.push(chunk);
+  }
+  const bytes = concatenateUint8Arrays(byteArr);
+  try {
+    const cert = loadX509FromPem(bytes);
+    TLS_INTERMEDIATE_CA_CACHE[url] = cert;
+  } catch (err) {
+    throw new AttestorError(
+      "ERROR_CERTIFICATE_FETCH_FAILED",
+      `Failed to parse certificate, error: ${err.message}`
+    );
+  }
+  return { bytes: concatenateUint8Arrays(byteArr) };
+};
+export {
+  fetchCertificateBytes
+};

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

@@ -1,4 +1,4 @@
-import { RPCHandler, RPCType } from '../../types';
+import type { RPCHandler, RPCType } from '#src/types/index.ts';
 export declare const HANDLERS: {
     [T in RPCType]: RPCHandler<T>;
 };

package/lib/server/handlers/index.js

@@ -1,22 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HANDLERS = void 0;
-const claimTunnel_1 = require("../../server/handlers/claimTunnel");
-const completeClaimOnChain_1 = require("../../server/handlers/completeClaimOnChain");
-const createClaimOnChain_1 = require("../../server/handlers/createClaimOnChain");
-const createTaskOnMechain_1 = require("../../server/handlers/createTaskOnMechain");
-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,
-    toprf: toprf_1.toprf,
-    createTaskOnMechain: createTaskOnMechain_1.createTaskOnMechain,
+import { claimTeeBundle } from "../../server/handlers/claimTeeBundle.js";
+import { claimTunnel } from "../../server/handlers/claimTunnel.js";
+import { completeClaimOnChain } from "../../server/handlers/completeClaimOnChain.js";
+import { createClaimOnChain } from "../../server/handlers/createClaimOnChain.js";
+import { createTaskOnMechain } from "../../server/handlers/createTaskOnMechain.js";
+import { createTunnel } from "../../server/handlers/createTunnel.js";
+import { disconnectTunnel } from "../../server/handlers/disconnectTunnel.js";
+import { fetchCertificateBytes } from "../../server/handlers/fetchCertificateBytes.js";
+import { init } from "../../server/handlers/init.js";
+import { toprf } from "../../server/handlers/toprf.js";
+const HANDLERS = {
+  createTunnel,
+  disconnectTunnel,
+  claimTunnel,
+  claimTeeBundle,
+  init,
+  createClaimOnChain,
+  completeClaimOnChain,
+  toprf,
+  createTaskOnMechain,
+  fetchCertificateBytes
+};
+export {
+  HANDLERS
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL2hhbmRsZXJzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGlFQUE2RDtBQUM3RCxtRkFBK0U7QUFDL0UsK0VBQTJFO0FBQzNFLGlGQUE2RTtBQUM3RSxtRUFBK0Q7QUFDL0QsMkVBQXVFO0FBQ3ZFLG1EQUErQztBQUMvQyxxREFBaUQ7QUFHcEMsUUFBQSxRQUFRLEdBQXNDO0lBQzFELFlBQVksRUFBWiwyQkFBWTtJQUNaLGdCQUFnQixFQUFoQixtQ0FBZ0I7SUFDaEIsV0FBVyxFQUFYLHlCQUFXO0lBQ1gsSUFBSSxFQUFKLFdBQUk7SUFDSixrQkFBa0IsRUFBbEIsdUNBQWtCO0lBQ2xCLG9CQUFvQixFQUFwQiwyQ0FBb0I7SUFDcEIsS0FBSyxFQUFMLGFBQUs7SUFDTCxtQkFBbUIsRUFBbkIseUNBQW1CO0NBQ25CLENBQUEifQ==

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

@@ -1,2 +1,2 @@
-import { RPCHandler } from '../../types';
+import type { RPCHandler } from '#src/types/index.ts';
 export declare const init: RPCHandler<'init'>;

package/lib/server/handlers/init.js

@@ -1,36 +1,33 @@
-"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');
+import { getBytes } from "ethers";
+import { getAttestorAddress } from "../../server/utils/generics.js";
+import { assertValidAuthRequest } from "../../utils/auth.js";
+import { getEnvVariable } from "../../utils/env.js";
+import { AttestorError } from "../../utils/index.js";
+import { SIGNATURES } from "../../utils/signatures/index.js";
+const TOPRF_PUBLIC_KEY = getEnvVariable("TOPRF_PUBLIC_KEY");
 const init = async (initRequest, { client }) => {
-    var _a;
-    if (client.isInitialised) {
-        throw utils_1.AttestorError.badRequest('Client already initialised');
-    }
-    if (!signatures_1.SIGNATURES[initRequest.signatureType]) {
-        throw utils_1.AttestorError.badRequest('Unsupported signature type');
-    }
-    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 {
-        toprfPublicKey: TOPRF_PUBLIC_KEY
-            ? ethers_1.ethers.utils.arrayify(TOPRF_PUBLIC_KEY)
-            : new Uint8Array()
-    };
+  if (client.isInitialised) {
+    throw AttestorError.badRequest("Client already initialised");
+  }
+  if (!SIGNATURES[initRequest.signatureType]) {
+    throw AttestorError.badRequest("Unsupported signature type");
+  }
+  if (initRequest.clientVersion <= 0) {
+    throw AttestorError.badRequest("Unsupported client version");
+  }
+  await assertValidAuthRequest(initRequest.auth, initRequest.signatureType);
+  if (initRequest.auth?.data) {
+    client.logger = client.logger.child({
+      userId: initRequest.auth.data.id
+    });
+  }
+  client.metadata = initRequest;
+  client.isInitialised = true;
+  return {
+    toprfPublicKey: TOPRF_PUBLIC_KEY ? getBytes(TOPRF_PUBLIC_KEY) : new Uint8Array(),
+    attestorAddress: getAttestorAddress(initRequest.signatureType)
+  };
+};
+export {
+  init
 };
-exports.init = init;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5pdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2ZXIvaGFuZGxlcnMvaW5pdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBK0I7QUFFL0IscUNBQXlDO0FBQ3pDLHlDQUF1RDtBQUN2RCx1Q0FBOEM7QUFDOUMscURBQWlEO0FBRWpELE1BQU0sZ0JBQWdCLEdBQUcsSUFBQSxvQkFBYyxFQUFDLGtCQUFrQixDQUFDLENBQUE7QUFFcEQsTUFBTSxJQUFJLEdBQXVCLEtBQUssRUFDNUMsV0FBVyxFQUNYLEVBQUUsTUFBTSxFQUFFLEVBQ1QsRUFBRTs7SUFDSCxJQUFHLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN6QixNQUFNLHFCQUFhLENBQUMsVUFBVSxDQUFDLDRCQUE0QixDQUFDLENBQUE7SUFDN0QsQ0FBQztJQUVELElBQUcsQ0FBQyx1QkFBVSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO1FBQzNDLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsSUFBRyxXQUFXLENBQUMsYUFBYSxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ25DLE1BQU0scUJBQWEsQ0FBQyxVQUFVLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQsTUFBTSxJQUFBLDZCQUFzQixFQUMzQixXQUFXLENBQUMsSUFBSSxFQUNoQixXQUFXLENBQUMsYUFBYSxDQUN6QixDQUFBO0lBRUQsSUFBRyxNQUFBLFdBQVcsQ0FBQyxJQUFJLDBDQUFFLElBQUksRUFBRSxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7WUFDbkMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7U0FDaEMsQ0FBQyxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sQ0FBQyxRQUFRLEdBQUcsV0FBVyxDQUFBO0lBQzdCLE1BQU0sQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFBO0lBRTNCLE9BQU87UUFDTixjQUFjLEVBQUUsZ0JBQWdCO1lBQy9CLENBQUMsQ0FBQyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQztZQUN6QyxDQUFDLENBQUMsSUFBSSxVQUFVLEVBQUU7S0FDbkIsQ0FBQTtBQUNGLENBQUMsQ0FBQTtBQW5DWSxRQUFBLElBQUksUUFtQ2hCIn0=

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

@@ -1,2 +1,2 @@
-import { RPCHandler } from '../../types';
+import type { RPCHandler } from '#src/types/index.ts';
 export declare const toprf: RPCHandler<'toprf'>;

package/lib/server/handlers/toprf.js

@@ -1,21 +1,19 @@
-"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");
+import { getBytes } from "ethers";
+import { getEnvVariable } from "../../utils/env.js";
+import { getEngineString, makeDefaultOPRFOperator } from "../../utils/index.js";
 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 };
+  const PRIVATE_KEY_STR = getEnvVariable("TOPRF_SHARE_PRIVATE_KEY");
+  const PUBLIC_KEY_STR = 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 = getBytes(PRIVATE_KEY_STR);
+  const PUBLIC_KEY = getBytes(PUBLIC_KEY_STR);
+  const engineStr = getEngineString(engine);
+  const operator = makeDefaultOPRFOperator("chacha20", engineStr, logger);
+  const res = await operator.evaluateOPRF(PRIVATE_KEY, maskedData);
+  return { ...res, publicKeyShare: PUBLIC_KEY };
+};
+export {
+  toprf
 };
-exports.toprf = toprf;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9wcmYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL2hhbmRsZXJzL3RvcHJmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUErQjtBQUUvQixxQ0FBb0U7QUFDcEUsdUNBQThDO0FBRXZDLE1BQU0sS0FBSyxHQUF3QixLQUFLLEVBQzlDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxFQUN0QixFQUFFLE1BQU0sRUFBRSxFQUNULEVBQUU7SUFDSCxNQUFNLGVBQWUsR0FBRyxJQUFBLG9CQUFjLEVBQUMseUJBQXlCLENBQUMsQ0FBQTtJQUNqRSxNQUFNLGNBQWMsR0FBRyxJQUFBLG9CQUFjLEVBQUMsd0JBQXdCLENBQUMsQ0FBQTtJQUMvRCxJQUFHLENBQUMsZUFBZSxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDeEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFBO0lBQ3BFLENBQUM7SUFFRCxNQUFNLFdBQVcsR0FBRyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQTtJQUMxRCxNQUFNLFVBQVUsR0FBRyxlQUFNLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUV4RCxNQUFNLFNBQVMsR0FBRyxJQUFBLHVCQUFlLEVBQUMsTUFBTSxDQUFDLENBQUE7SUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBQSwrQkFBdUIsRUFBQyxVQUFVLEVBQUUsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBQ3ZFLE1BQU0sR0FBRyxHQUFHLE1BQU0sUUFBUSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUE7SUFFaEUsT0FBTyxFQUFFLEdBQUcsR0FBRyxFQUFFLGNBQWMsRUFBRSxVQUFVLEVBQUUsQ0FBQTtBQUM5QyxDQUFDLENBQUE7QUFsQlksUUFBQSxLQUFLLFNBa0JqQiJ9

package/lib/server/index.d.ts

@@ -1,4 +1,4 @@
-export * from './utils/config-env';
-export * from './create-server';
-export * from './tunnels/make-tcp-tunnel';
-export * from './utils/assert-valid-claim-request';
+export * from './utils/config-env.ts';
+export * from './create-server.ts';
+export * from './tunnels/make-tcp-tunnel.ts';
+export * from './utils/assert-valid-claim-request.ts';

package/lib/server/index.js

@@ -1,21 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./utils/config-env"), exports);
-__exportStar(require("./create-server"), exports);
-__exportStar(require("./tunnels/make-tcp-tunnel"), exports);
-__exportStar(require("./utils/assert-valid-claim-request"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmVyL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxREFBa0M7QUFDbEMsa0RBQStCO0FBQy9CLDREQUF5QztBQUN6QyxxRUFBa0QifQ==
+export * from "./utils/config-env.js";
+export * from "./create-server.js";
+export * from "./tunnels/make-tcp-tunnel.js";
+export * from "./utils/assert-valid-claim-request.js";

package/lib/server/socket.d.ts

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

package/lib/server/socket.js

@@ -1,114 +1,112 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AttestorServerSocket = void 0;
-const message_handler_1 = require("../client/utils/message-handler");
-const config_1 = require("../config");
-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, 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));
-        // forward packets to the appropriate tunnel
-        this.addEventListener('tunnel-message', handleTunnelMessage.bind(this));
-        // close all tunnels when the connection is terminated
-        // since this tunnel can no longer be written to
-        this.addEventListener('connection-terminated', () => {
-            for (const tunnelId in this.tunnels) {
-                const tunnel = this.tunnels[tunnelId];
-                void tunnel.close(new Error('WS session terminated'));
-            }
-        });
-    }
-    getTunnel(tunnelId) {
+import { promisify } from "util";
+import { handleMessage } from "../client/utils/message-handler.js";
+import { DEFAULT_RPC_TIMEOUT_MS } from "../config/index.js";
+import { HANDLERS } from "../server/handlers/index.js";
+import { getApm } from "../server/utils/apm.js";
+import { getInitialMessagesFromQuery } from "../server/utils/generics.js";
+import { AttestorError, generateSessionId } from "../utils/index.js";
+import { AttestorSocket } from "../utils/socket-base.js";
+class AttestorServerSocket extends AttestorSocket {
+  tunnels = {};
+  sessionId;
+  bgpListener;
+  constructor(socket, sessionId, bgpListener, logger) {
+    super(socket, {}, logger);
+    this.sessionId = sessionId;
+    this.bgpListener = bgpListener;
+    this.addEventListener("rpc-request", handleRpcRequest.bind(this));
+    this.addEventListener("tunnel-message", handleTunnelMessage.bind(this));
+    this.addEventListener("connection-terminated", () => {
+      for (const tunnelId in this.tunnels) {
         const tunnel = this.tunnels[tunnelId];
-        if (!tunnel) {
-            throw new utils_1.AttestorError('ERROR_NOT_FOUND', `Tunnel "${tunnelId}" not found`);
-        }
-        return tunnel;
-    }
-    removeTunnel(tunnelId) {
-        delete this.tunnels[tunnelId];
+        void tunnel.close(new Error("WS session terminated"));
+      }
+    });
+  }
+  getTunnel(tunnelId) {
+    const tunnel = this.tunnels[tunnelId];
+    if (!tunnel) {
+      throw new AttestorError(
+        "ERROR_NOT_FOUND",
+        `Tunnel "${tunnelId}" not found`
+      );
     }
-    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, bgpListener, logger);
-        try {
-            const initMsgs = (0, generics_1.getInitialMessagesFromQuery)(req);
-            logger.trace({ initMsgs: initMsgs.length }, 'new connection, validating...');
-            for (const msg of initMsgs) {
-                await message_handler_1.handleMessage.call(client, msg);
-            }
-            logger.debug('connection accepted');
-        }
-        catch (err) {
-            logger.error({ err }, 'error in new connection');
-            if (client.isOpen) {
-                await client.terminateConnection(err instanceof utils_1.AttestorError
-                    ? err
-                    : utils_1.AttestorError.badRequest(err.message));
-            }
-            return;
-        }
-        return client;
+    return tunnel;
+  }
+  removeTunnel(tunnelId) {
+    delete this.tunnels[tunnelId];
+  }
+  static async acceptConnection(socket, { req, logger, bgpListener }) {
+    const bindSend = socket.send.bind(socket);
+    socket.send = promisify(bindSend);
+    const sessionId = generateSessionId();
+    logger = logger.child({ sessionId });
+    const client = new AttestorServerSocket(
+      socket,
+      sessionId,
+      bgpListener,
+      logger
+    );
+    try {
+      const initMsgs = getInitialMessagesFromQuery(req);
+      logger.trace(
+        { initMsgs: initMsgs.length },
+        "new connection, validating..."
+      );
+      for (const msg of initMsgs) {
+        await handleMessage.call(client, msg);
+      }
+      logger.debug("connection accepted");
+    } catch (err) {
+      logger.error({ err }, "error in new connection");
+      if (client.isOpen) {
+        await client.terminateConnection(
+          err instanceof AttestorError ? err : AttestorError.badRequest(err.message)
+        );
+      }
+      return;
     }
+    return client;
+  }
 }
-exports.AttestorServerSocket = AttestorServerSocket;
 async function handleTunnelMessage({ data: { tunnelId, message } }) {
-    var _a;
-    try {
-        const tunnel = this.getTunnel(tunnelId);
-        await tunnel.write(message);
-    }
-    catch (err) {
-        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error({ err, tunnelId }, 'error writing to tunnel');
-    }
+  try {
+    const tunnel = this.getTunnel(tunnelId);
+    await tunnel.write(message);
+  } catch (err) {
+    this.logger?.error({ err, tunnelId }, "error writing to tunnel");
+  }
 }
 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);
-    }
-    const timeout = setTimeout(() => {
-        logger.warn({ type, requestId }, 'RPC took too long to respond');
-    }, config_1.DEFAULT_RPC_TIMEOUT_MS);
-    try {
-        logger.debug({ data }, 'handling RPC request');
-        const handler = handlers_1.HANDLERS[type];
-        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 {
-        clearTimeout(timeout);
-        tx === null || tx === void 0 ? void 0 : tx.end();
-    }
+  const logger = this.logger.child({ rpc: type, requestId });
+  const apm = getApm();
+  const tx = apm?.startTransaction(type);
+  tx?.setLabel("requestId", requestId);
+  tx?.setLabel("sessionId", this.sessionId.toString());
+  const userId = this.metadata.auth?.data?.id;
+  if (userId) {
+    tx?.setLabel("authUserId", userId);
+  }
+  const timeout = setTimeout(() => {
+    logger.warn({ type, requestId }, "RPC took too long to respond");
+  }, DEFAULT_RPC_TIMEOUT_MS);
+  try {
+    logger.debug({ data }, "handling RPC request");
+    const handler = HANDLERS[type];
+    const res = await handler(data, { client: this, logger, tx });
+    respond(res);
+    logger.debug({ res }, "handled RPC request");
+    tx?.setOutcome("success");
+  } catch (err) {
+    logger.error({ err }, "error in RPC request");
+    respond(AttestorError.fromError(err));
+    tx?.setOutcome("failure");
+    apm?.captureError(err, { parent: tx });
+  } finally {
+    clearTimeout(timeout);
+    tx?.end();
+  }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29ja2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZlci9zb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsc0VBQWdFO0FBQ2hFLHVDQUFtRDtBQUVuRCxrREFBOEM7QUFDOUMsOENBQTZDO0FBQzdDLHdEQUF1RTtBQUV2RSxxQ0FBNEQ7QUFDNUQsdURBQXNEO0FBQ3RELCtCQUFnQztBQUdoQyxNQUFhLG9CQUFxQixTQUFRLDRCQUFjO0lBSXZELFlBQ0MsTUFBVSxFQUNILFNBQWlCLEVBQ2pCLFdBQW9DLEVBQzNDLE1BQWM7UUFFZCxhQUFhO1FBQ2IsS0FBSyxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFMbEIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixnQkFBVyxHQUFYLFdBQVcsQ0FBeUI7UUFMNUMsWUFBTyxHQUFxQyxFQUFFLENBQUE7UUFVN0Msc0JBQXNCO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7UUFDakUsNENBQTRDO1FBQzVDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxnQkFBZ0IsRUFBRSxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQTtRQUN2RSxzREFBc0Q7UUFDdEQsZ0RBQWdEO1FBQ2hELElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyx1QkFBdUIsRUFBRSxHQUFHLEVBQUU7WUFDbkQsS0FBSSxNQUFNLFFBQVEsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3BDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7Z0JBQ3JDLEtBQUssTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUE7WUFDdEQsQ0FBQztRQUNGLENBQUMs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
+export {
+  AttestorServerSocket
+};

package/lib/server/tunnels/make-tcp-tunnel.d.ts

@@ -1,6 +1,6 @@
-import { CreateTunnelRequest } from '../../proto/api';
-import type { Logger } from '../../types';
-import type { MakeTunnelFn, TCPSocketProperties } from '../../types';
+import type { CreateTunnelRequest } from '#src/proto/api.ts';
+import type { Logger } from '#src/types/index.ts';
+import type { MakeTunnelFn, TCPSocketProperties } from '#src/types/index.ts';
 type ExtraOpts = Omit<CreateTunnelRequest, 'id' | 'initialMessage'> & {
     logger: Logger;
 };
@@ -8,6 +8,8 @@ type ExtraOpts = Omit<CreateTunnelRequest, 'id' | 'initialMessage'> & {
  * Builds a TCP tunnel to the given host and port.
  * If a geolocation is provided -- an HTTPS proxy is used
  * to connect to the host.
+ * If a proxySessionId is provided -- a static ip is used with HTTPS proxy
+ * across multiple requests with this same proxySessionId.
  *
  * HTTPS proxy essentially creates an opaque tunnel to the
  * host using the CONNECT method. Any data can be sent through