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

package/dist/index.js

@@ -10027,7 +10027,10 @@ function errorMessage(value) {
   }
   return String(value);
 }
-var init_error = () => {};
+var EXPECTED_ERROR;
+var init_error = __esm(() => {
+  EXPECTED_ERROR = Symbol.for("sockethub.expectedError");
+});
 
 // src/version.ts
 import { createRequire as createRequire2 } from "node:module";
@@ -16586,7 +16589,7 @@ var init_package = __esm(() => {
   package_default = {
     name: "@sockethub/schemas",
     description: "JSON schema files for validating Sockethub Activity Streams",
-    version: "3.0.0-alpha.22",
+    version: "3.0.0-alpha.24",
     type: "module",
     private: false,
     author: "Nick Jennings <nick@silverbucket.net>",
@@ -16656,7 +16659,7 @@ var init_package = __esm(() => {
       "ajv-formats": "^2.1.1",
       "ajv-formats-draft2019": "^1.6.1"
     },
-    gitHead: "1630010f605e85cc548e3323cb9694fbe3a7a18a",
+    gitHead: "e778256d7067e2743cd6807a15d39a0cc65a358d",
     types: "./dist/index.d.ts"
   };
 });
@@ -66473,6 +66476,36 @@ var init_esm5 = __esm(() => {
 function setObservabilityAdapter(next) {
   adapter = next;
 }
+function startConnectionTelemetry() {
+  const startedAt = performance.now();
+  const platforms = new Set;
+  let ended = false;
+  observability.count("sockethub.connection.opened");
+  return {
+    recordPlatform(platform2) {
+      if (ended || platforms.has(platform2)) {
+        return;
+      }
+      platforms.add(platform2);
+      observability.count("sockethub.platform_session.started", 1, {
+        platform: platform2
+      });
+    },
+    end() {
+      if (ended) {
+        return;
+      }
+      ended = true;
+      observability.count("sockethub.connection.closed");
+      observability.distribution("sockethub.connection.duration", performance.now() - startedAt, "millisecond");
+      const classification = platforms.size === 0 ? "inactive" : platforms.size === 1 ? "single_platform" : "multi_platform";
+      observability.count("sockethub.connection.classified", 1, {
+        classification
+      });
+      observability.distribution("sockethub.connection.platform_count", platforms.size, "none");
+    }
+  };
+}
 function redactObservabilityLog(message) {
   return message.replace(/https?:\/\/\S+/gi, "[url]").replace(/\b[\w.+-]+@[\w.-]+\.[a-z]{2,}\b/gi, "[address]").replace(/\b(?:\d{1,3}\.){3}\d{1,3}\b/g, "[ip]").replace(/\b[0-9a-f]{0,4}:[0-9a-f:]{2,}\b/gi, "[ip]");
 }
@@ -66492,12 +66525,14 @@ var init_observability = __esm(() => {
   noopAdapter = {
     count: () => {},
     gauge: () => {},
+    distribution: () => {},
     startAction: () => () => {}
   };
   adapter = noopAdapter;
   observability = {
     count: (...args) => adapter.count(...args),
     gauge: (...args) => adapter.gauge(...args),
+    distribution: (...args) => adapter.distribution(...args),
     startAction: (...args) => adapter.startAction(...args)
   };
 });
@@ -71460,6 +71495,7 @@ var exports_sentry = {};
 __export(exports_sentry, {
   SENTRY_FLUSH_TIMEOUT_MS: () => SENTRY_FLUSH_TIMEOUT_MS,
   count: () => count2,
+  distribution: () => distribution2,
   flush: () => flush3,
   gauge: () => gauge2,
   reportError: () => reportError,
@@ -71483,9 +71519,14 @@ function gauge2(name, value, attributes = {}) {
     exports_public_api.gauge(name, value, { attributes });
   }
 }
-function startAction(platform3, action) {
+function distribution2(name, value, unit, attributes = {}) {
+  if (sentryConfig.enableMetrics) {
+    exports_public_api.distribution(name, value, { unit, attributes });
+  }
+}
+function startAction(platform3, action, additionalAttributes = {}) {
   const startedAt = performance.now();
-  const attributes = { platform: platform3, action };
+  const attributes = { platform: platform3, action, ...additionalAttributes };
   count2("sockethub.action.started", 1, attributes);
   const span = startInactiveSpan({
     name: `${platform3}.${action}`,
@@ -71497,12 +71538,7 @@ function startAction(platform3, action) {
     span.setStatus({ code: error4 ? 2 : 1 });
     span.end();
     count2(error4 ? "sockethub.action.failed" : "sockethub.action.completed", 1, attributes);
-    if (sentryConfig.enableMetrics) {
-      exports_public_api.distribution("sockethub.action.duration", duration, {
-        unit: "millisecond",
-        attributes
-      });
-    }
+    distribution2("sockethub.action.duration", duration, "millisecond", attributes);
   };
 }
 async function sendTestEvent() {
@@ -71555,7 +71591,7 @@ var init_sentry = __esm(async () => {
   setTag("service", "sockethub");
   setTag("process", process.env.SOCKETHUB_PLATFORM_CHILD === "1" ? "platform" : "server");
   logger2.info("initialized sentry observability");
-  setObservabilityAdapter({ count: count2, gauge: gauge2, startAction });
+  setObservabilityAdapter({ count: count2, gauge: gauge2, distribution: distribution2, startAction });
 });
 
 // ../util/dist/crypto/index.js
@@ -137931,7 +137967,7 @@ var require_package2 = __commonJS(function(exports, module) {
   module.exports = {
     name: "@sockethub/server",
     description: "A polyglot messaging service, server libraries",
-    version: "5.0.0-alpha.22",
+    version: "5.0.0-alpha.24",
     type: "module",
     private: false,
     author: "Nick Jennings <nick@silverbucket.net>",
@@ -137982,11 +138018,11 @@ var require_package2 = __commonJS(function(exports, module) {
     dependencies: {
       "@sentry/node": "^10.36.0",
       "@sentry/profiling-node": "10.36.0",
-      "@sockethub/client": "^5.0.0-alpha.22",
-      "@sockethub/data-layer": "^1.0.0-alpha.22",
-      "@sockethub/logger": "^1.0.0-alpha.22",
-      "@sockethub/schemas": "^3.0.0-alpha.22",
-      "@sockethub/util": "^1.0.0-alpha.10",
+      "@sockethub/client": "^5.0.0-alpha.24",
+      "@sockethub/data-layer": "^1.0.0-alpha.24",
+      "@sockethub/logger": "^1.0.0-alpha.24",
+      "@sockethub/schemas": "^3.0.0-alpha.24",
+      "@sockethub/util": "^1.0.0-alpha.12",
       chalk: "^5.6.2",
       convict: "^6.2.5",
       ejs: "^3.1.10",
@@ -138017,16 +138053,16 @@ var require_package2 = __commonJS(function(exports, module) {
       "web-streams-polyfill": "^3.3.3"
     },
     optionalDependencies: {
-      "@sockethub/examples": "^1.0.0-alpha.22",
-      "@sockethub/platform-caldav": "^1.0.0-alpha.6",
-      "@sockethub/platform-carddav": "^1.0.0-alpha.3",
-      "@sockethub/platform-dummy": "^3.0.0-alpha.22",
-      "@sockethub/platform-feeds": "^4.0.0-alpha.22",
-      "@sockethub/platform-irc": "^4.0.0-alpha.22",
-      "@sockethub/platform-metadata": "^1.0.1-alpha.17",
-      "@sockethub/platform-xmpp": "^5.0.0-alpha.22"
-    },
-    gitHead: "1630010f605e85cc548e3323cb9694fbe3a7a18a",
+      "@sockethub/examples": "^1.0.0-alpha.24",
+      "@sockethub/platform-caldav": "^1.0.0-alpha.8",
+      "@sockethub/platform-carddav": "^1.0.0-alpha.5",
+      "@sockethub/platform-dummy": "^3.0.0-alpha.24",
+      "@sockethub/platform-feeds": "^4.0.0-alpha.24",
+      "@sockethub/platform-irc": "^4.0.0-alpha.24",
+      "@sockethub/platform-metadata": "^1.0.1-alpha.19",
+      "@sockethub/platform-xmpp": "^5.0.0-alpha.24"
+    },
+    gitHead: "e778256d7067e2743cd6807a15d39a0cc65a358d",
     types: "./dist/index.d.ts"
   };
 });
@@ -196701,11 +196737,16 @@ function createMessageHandlers(options) {
     credentialsStore,
     clientIp,
     platformSessionId,
-    onPlatformInstance
+    onPlatformInstance,
+    transport = "socket",
+    onPlatformAction
   } = options;
   const credentials = middleware("credentials").use(normalizeActivityStreamMiddleware).use(validate("credentials", sessionId)).use(storeCredentials(credentialsStore, sessionId)).use((data, next) => {
     const platform3 = resolvePlatformId(data) ?? "unknown";
-    observability.startAction(platform3, "credentials")();
+    onPlatformAction?.(platform3, "credentials");
+    observability.startAction(platform3, "credentials", {
+      transport
+    })();
     next(data);
   }).use((err, data, next) => {
     next(attachError(err, data));
@@ -196723,7 +196764,10 @@ function createMessageHandlers(options) {
       next(attachError("unable to resolve platform from @context", msg));
       return;
     }
-    const finish = observability.startAction(platformId, msg.type);
+    onPlatformAction?.(platformId, msg.type);
+    const finish = observability.startAction(platformId, msg.type, {
+      transport
+    });
     let platformInstance;
     try {
       platformInstance = await processManager.get(platformId, msg.actor.id, platformSessionId, clientIp, sessionId);
@@ -197162,6 +197206,7 @@ function registerHttpActionsRoutes(app, options, deps = {}) {
       sessionId,
       sessionSecret,
       credentialsStore,
+      transport: "http",
       onPlatformInstance: (platformInstance) => {
         if (!platformInstance.config.persist) {
           return;
@@ -198253,7 +198298,7 @@ class Sockethub {
       return;
     }
     this.activeConnections += 1;
-    observability.count("sockethub.connection.opened");
+    const connectionTelemetry = startConnectionTelemetry();
     observability.gauge("sockethub.connection.active", this.activeConnections);
     const credentialsStore = new CredentialsStore(this.parentId, socket.id, crypto.deriveSecret(this.parentSecret1, sessionSecret), config_default.get("redis"), { ttlMs: getCredentialsTtlMs() });
     sessionLog.debug("socket.io connection");
@@ -198280,7 +198325,7 @@ class Sockethub {
       clearSessionScopes(socket.id);
       this.releaseIpSlot(clientIp);
       this.activeConnections = Math.max(0, this.activeConnections - 1);
-      observability.count("sockethub.connection.closed");
+      connectionTelemetry.end();
       observability.gauge("sockethub.connection.active", this.activeConnections);
     });
     const handlers2 = createMessageHandlers({
@@ -198289,7 +198334,9 @@ class Sockethub {
       sessionSecret,
       credentialsStore,
       clientIp,
-      platformSessionId: socket.id
+      platformSessionId: socket.id,
+      transport: "socket",
+      onPlatformAction: (platform3) => connectionTelemetry.recordPlatform(platform3)
     });
     socket.on("credentials", handlers2.credentials);
     socket.on("message", handlers2.message);
@@ -198534,4 +198581,4 @@ export {
   server
 };
 
-//# debugId=E054626A88B96F6264756E2164756E21
+//# debugId=55027E92341AB74264756E2164756E21