@rpcbase/server 0.469.0 → 0.470.0

package/dist/index.js

@@ -11,7 +11,7 @@ import { createInterface } from "node:readline";
 import { AsyncLocalStorage } from "node:async_hooks";
 import assert$1 from "assert";
 import crypto$1, { hkdfSync, scrypt } from "crypto";
-import { createProxyMiddleware } from "http-proxy-middleware";
+import httpProxy from "http-proxy-3";
 import fs from "node:fs/promises";
 import { Transform } from "node:stream";
 import { StrictMode, createElement } from "react";
@@ -3261,22 +3261,41 @@ const getDerivedKey = (masterKey, info, length = 32, salt = "") => {
     length
   )).toString("hex");
 };
-const handleProxyError = (err) => {
-  console.error(`Proxy error: ${err.message}`);
+const POSTHOG_INGEST_TARGET = "https://eu.i.posthog.com";
+const getStatusCode = (errorCode) => {
+  if (typeof errorCode === "string" && /HPE_INVALID/.test(errorCode)) {
+    return 502;
+  }
+  switch (errorCode) {
+    case "ECONNRESET":
+    case "ENOTFOUND":
+    case "ECONNREFUSED":
+    case "ETIMEDOUT":
+      return 504;
+    default:
+      return 500;
+  }
 };
+const proxy = httpProxy.createProxyServer({
+  changeOrigin: true
+});
+proxy.on("error", (err, req, res) => {
+  console.error(`Proxy error: ${err?.message ?? String(err)}`);
+  if (!res || typeof res.writeHead !== "function") return;
+  if (res.headersSent) return;
+  const statusCode = getStatusCode(err?.code);
+  res.writeHead(statusCode);
+  const host = req?.headers?.host ?? "";
+  const url = req?.url ?? "";
+  res.end(`Error occurred while trying to proxy: ${host}${url}`);
+});
 const metricsIngestProxyMiddleware = (app) => {
-  app.use(
-    "/ingest",
-    createProxyMiddleware({
-      target: "https://eu.i.posthog.com",
-      changeOrigin: true,
-      pathRewrite: { "^/ingest": "" },
-      // Remove '/ingest' from the proxied request
-      on: {
-        error: handleProxyError
-      }
-    })
-  );
+  app.use("/ingest", (req, res) => {
+    if (!req.url) {
+      req.url = "/";
+    }
+    proxy.web(req, res, { target: POSTHOG_INGEST_TARGET });
+  });
 };
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 let hasWarnedNoReplicationEnabled = false;

package/dist/metricsIngestProxyMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metricsIngestProxyMiddleware.d.ts","sourceRoot":"","sources":["../src/metricsIngestProxyMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AAUnC,eAAO,MAAM,4BAA4B,GAAI,KAAK,WAAW,SAY5D,CAAA"}
+{"version":3,"file":"metricsIngestProxyMiddleware.d.ts","sourceRoot":"","sources":["../src/metricsIngestProxyMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AAwCxC,eAAO,MAAM,4BAA4B,GAAI,KAAK,WAAW,SAQ5D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/server",
-  "version": "0.469.0",
+  "version": "0.470.0",
   "type": "module",
   "files": [
     "dist"
@@ -75,7 +75,7 @@
     "connect-redis": "9.0.0",
     "express-session": "1.18.2",
     "mongodb": "7.0.0",
-    "http-proxy-middleware": "3.0.5",
+    "http-proxy-3": "1.23.2",
     "redis": "5.10.0",
     "ws": "8.18.3"
   },