@sockethub/server 5.0.0-alpha.21 → 5.0.0-alpha.22

package/dist/platform.js

@@ -26685,7 +26685,7 @@ var init_package = __esm(() => {
   package_default = {
     name: "@sockethub/schemas",
     description: "JSON schema files for validating Sockethub Activity Streams",
-    version: "3.0.0-alpha.21",
+    version: "3.0.0-alpha.22",
     type: "module",
     private: false,
     author: "Nick Jennings <nick@silverbucket.net>",
@@ -26755,7 +26755,7 @@ var init_package = __esm(() => {
       "ajv-formats": "^2.1.1",
       "ajv-formats-draft2019": "^1.6.1"
     },
-    gitHead: "683f7b2c0cda2eda05c845eb98827cf13d055eb4",
+    gitHead: "1630010f605e85cc548e3323cb9694fbe3a7a18a",
     types: "./dist/index.d.ts"
   };
 });
@@ -27072,6 +27072,11 @@ var init_sockethub_config = __esm(() => {
             default: 262144,
             description: "Maximum size in bytes of a single Socket.IO message."
           },
+          trustProxy: {
+            type: ["boolean", "number", "string"],
+            default: false,
+            description: "Express 'trust proxy' setting, deciding whether " + "'x-forwarded-for' is believed when determining a " + "client's IP for HTTP rate limiting. false trusts no " + "proxy; a number trusts that many hops; a string " + "takes an address, subnet or preset ('loopback'). " + "Only enable behind a reverse proxy that overwrites " + "the header. When left false while " + "credentialCheck.reconnectIpSource is 'proxy' and " + "credentialCheck.proxyHeader is 'x-forwarded-for', " + "one hop is trusted so both paths agree; a custom " + "proxyHeader requires setting this explicitly."
+          },
           cors: {
             type: "object",
             additionalProperties: false,
@@ -73853,6 +73858,11 @@ var init_config_schema = __esm(() => {
       env: "SOCKETHUB_MAX_PAYLOAD_BYTES",
       emptyEnvIsUnset: true
     },
+    "sockethub.trustProxy": {
+      format: "*",
+      env: "SOCKETHUB_TRUST_PROXY",
+      emptyEnvIsUnset: true
+    },
     "sockethub.cors.origin": {
       env: "SOCKETHUB_CORS_ORIGIN",
       arg: "cors.origin"
@@ -115177,7 +115187,9 @@ var init_esm7 = __esm(() => {
 // src/sentry.ts
 var exports_sentry = {};
 __export(exports_sentry, {
+  SENTRY_FLUSH_TIMEOUT_MS: () => SENTRY_FLUSH_TIMEOUT_MS,
   count: () => count2,
+  flush: () => flush3,
   gauge: () => gauge2,
   reportError: () => reportError,
   sendTestEvent: () => sendTestEvent,
@@ -115187,6 +115199,9 @@ function reportError(err) {
   logger2.warn("reporting error");
   captureException(err);
 }
+function flush3(timeoutMs = SENTRY_FLUSH_TIMEOUT_MS) {
+  return flush(timeoutMs);
+}
 function count2(name, value = 1, attributes = {}) {
   if (sentryConfig.enableMetrics) {
     exports_public_api.count(name, value, { attributes });
@@ -115223,7 +115238,7 @@ async function sendTestEvent() {
   captureMessage("Sockethub Sentry verification event", "info");
   return flush(5000);
 }
-var logger2, sentryConfig, integrations;
+var SENTRY_FLUSH_TIMEOUT_MS = 2000, logger2, sentryConfig, integrations;
 var init_sentry = __esm(async () => {
   init_esm5();
   init_src();
@@ -136782,12 +136797,16 @@ async function startPlatformProcess() {
       });
     }
   };
-  (async () => {
-    if (resolveSentryConfig().dsn) {
-      logger3.info("initializing sentry");
-      sentry = await init_sentry().then(() => exports_sentry);
-    }
-  })();
+  process.once("uncaughtException", (err) => {
+    reportFatal(toError(err));
+  });
+  process.once("unhandledRejection", (err) => {
+    reportFatal(toError(err));
+  });
+  if (resolveSentryConfig().dsn) {
+    logger3.info("initializing sentry");
+    sentry = await init_sentry().then(() => exports_sentry);
+  }
   let jobWorker;
   let jobWorkerStarted = false;
   let parentSecret1;
@@ -136865,22 +136884,21 @@ async function startPlatformProcess() {
   function isPersistentPlatform(platform4) {
     return platform4.config.persist === true;
   }
-  process.once("uncaughtException", (err) => {
-    console.log("EXCEPTION IN PLATFORM");
-    sentry.reportError(err);
-    console.log(`error:
-`, err.stack);
-    safeProcessSend(["error", err.toString()]);
-    process.exit(1);
-  });
-  process.once("unhandledRejection", (err) => {
+  async function reportFatal(err) {
     console.log("EXCEPTION IN PLATFORM");
     sentry.reportError(err);
     console.log(`error:
 `, err.stack);
     safeProcessSend(["error", err.toString()]);
+    try {
+      if (await sentry.flush?.() === false) {
+        console.error(`fatal-error-flush timed out for ${platformName} ${identifier}; event may be lost`);
+      }
+    } catch (flushErr) {
+      console.error(`fatal-error-flush failed for ${platformName} ${identifier}: ${errorMessage(flushErr)}`);
+    }
     process.exit(1);
-  });
+  }
   process.on("disconnect", () => {
     console.log(`Parent disconnected. Child ${process.pid} exiting.`);
     process.exit(1);
@@ -137059,4 +137077,4 @@ export {
   mergePackageConfig
 };
 
-//# debugId=EE1E92BCF7ECF0AB64756E2164756E21
+//# debugId=6CD4B2D6787607E264756E2164756E21