@sockethub/server 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/platform.js

@@ -20497,7 +20497,7 @@ var init_package = __esm(() => {
   package_default = {
     name: "@sockethub/schemas",
     description: "JSON schema files for validating Sockethub Activity Streams",
-    version: "3.0.0-beta.1",
+    version: "3.0.0-beta.3",
     type: "module",
     private: false,
     author: "Nick Jennings <nick@silverbucket.net>",
@@ -20567,7 +20567,7 @@ var init_package = __esm(() => {
       "ajv-formats": "^2.1.1",
       "ajv-formats-draft2019": "^1.6.1"
     },
-    gitHead: "06c9062f1cb5f0c0599fd979e6e91da79f08eda0",
+    gitHead: "bc04522d60d1e2fa1b3098b339897de62c3b0549",
     types: "./dist/index.d.ts"
   };
 });
@@ -20676,8 +20676,12 @@ var init_sockethub_config = __esm(() => {
           "@sockethub/platform-caldav",
           "@sockethub/platform-dummy",
           "@sockethub/platform-feeds",
+          "@sockethub/platform-email",
           "@sockethub/platform-irc",
           "@sockethub/platform-metadata",
+          "@sockethub/platform-messenger",
+          "@sockethub/platform-instagram",
+          "@sockethub/platform-whatsapp",
           "@sockethub/platform-xmpp"
         ]
       },
@@ -20693,7 +20697,8 @@ var init_sockethub_config = __esm(() => {
               connectTimeoutMs: { type: "integer", minimum: 1 },
               allowPrivateAddresses: { type: "boolean" },
               allowInsecureHttp: { type: "boolean" },
-              concurrency: { type: "integer", minimum: 1 }
+              concurrency: { type: "integer", minimum: 1 },
+              discoveryCacheTtlMs: { type: "integer", minimum: 0 }
             }
           },
           "@sockethub/platform-caldav": {
@@ -20703,7 +20708,20 @@ var init_sockethub_config = __esm(() => {
               connectTimeoutMs: { type: "integer", minimum: 1 },
               allowPrivateAddresses: { type: "boolean" },
               allowInsecureHttp: { type: "boolean" },
-              concurrency: { type: "integer", minimum: 1 }
+              concurrency: { type: "integer", minimum: 1 },
+              discoveryCacheTtlMs: { type: "integer", minimum: 0 }
+            }
+          },
+          "@sockethub/platform-email": {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+              connectTimeoutMs: {
+                type: "integer",
+                minimum: 5000,
+                maximum: 120000
+              },
+              allowPrivateAddresses: { type: "boolean" }
             }
           },
           "@sockethub/platform-dummy": {
@@ -20726,7 +20744,8 @@ var init_sockethub_config = __esm(() => {
             type: "object",
             additionalProperties: false,
             properties: {
-              connectTimeoutMs: { type: "number" }
+              connectTimeoutMs: { type: "number" },
+              allowPrivateAddresses: { type: "boolean" }
             }
           },
           "@sockethub/platform-xmpp": {
@@ -20836,6 +20855,12 @@ var init_sockethub_config = __esm(() => {
             default: 20,
             description: "Maximum persistent instances per client IP, including HTTP actions. 0 disables the cap."
           },
+          maxStartsPerIpPerMinute: {
+            type: "integer",
+            minimum: 0,
+            default: 60,
+            description: "Maximum new persistent instances a client IP may start per minute, " + "including HTTP actions. Bounds fork/teardown churn that the " + "concurrent caps allow. Reusing a running instance does not count. " + "0 disables the cap."
+          },
           maxPlatformInstances: {
             type: "number",
             minimum: 0,
@@ -73932,6 +73957,7 @@ var init_config_schema = __esm(() => {
     "rateLimiter.maxConnectionsPerIp": { format: "nat" },
     "limits.maxInstancesPerSession": { format: "nat" },
     "limits.maxInstancesPerIp": { format: "nat" },
+    "limits.maxStartsPerIpPerMinute": { format: "nat" },
     "limits.maxPlatformInstances": { format: "nat" },
     "credentials.ttlMs": {
       format: "nat",
@@ -95752,6 +95778,7 @@ class JobWorker extends JobBase {
   redisConfig;
   queueId;
   concurrency;
+  maxStalledCount;
   initialized = false;
   constructor(parentId, instanceId, secret, redisConfig, options = {}) {
     super(secret);
@@ -95760,6 +95787,7 @@ class JobWorker extends JobBase {
       throw new Error(`JobWorker concurrency must be a positive integer, got ${options.concurrency}`);
     }
     this.concurrency = concurrency;
+    this.maxStalledCount = options.maxStalledCount ?? 3;
     this.log = createLogger(`data-layer:worker:${parentId}:${instanceId}`);
     this.connectionName = getLoggerNamespace(this.log);
     redisConfig.connectionName = this.connectionName;
@@ -95775,7 +95803,7 @@ class JobWorker extends JobBase {
     this.worker = new import_bullmq2.Worker(queueName, this.jobHandler.bind(this), {
       connection: this.redisConfig,
       concurrency: this.concurrency,
-      maxStalledCount: 3
+      maxStalledCount: this.maxStalledCount
     });
     this.worker.on("error", (err) => {
       this.log.warn(`worker error: ${err.message}`);
@@ -96216,7 +96244,10 @@ async function startPlatformProcess() {
       }
     }
     const concurrency = getWorkerConcurrency();
-    jobWorker = new JobWorker(parentId, queueInstanceId, parentSecret1 + parentSecret2, { url: redisUrl }, { concurrency });
+    jobWorker = new JobWorker(parentId, queueInstanceId, parentSecret1 + parentSecret2, { url: redisUrl }, {
+      concurrency,
+      maxStalledCount: platform.config.persist && platform.config.retryStalledJobs === false ? 0 : 3
+    });
     logger.info(`listening on the queue for incoming jobs (concurrency: ${concurrency})`);
     jobWorker.onJob(getJobHandler());
     jobWorkerStarted = true;

package/dist/process-manager.d.ts

@@ -6,6 +6,8 @@ declare class ProcessManager {
     private readonly parentSecret2;
     private init;
     private readonly ensureChains;
+    private readonly startsPerIp;
+    private startsWindowBegan;
     constructor(parentId: string, parentSecret1: string, parentSecret2: string, init: IInitObject);
     /**
      * @param sessionId socket id to register with the instance; absent for HTTP
@@ -28,6 +30,15 @@ declare class ProcessManager {
      * of client occupancy. Check owners even when attaching to a shared worker.
      */
     private assertInstanceCapacity;
+    /**
+     * Instance caps bound how many workers run at once, not how fast a client
+     * can churn them (e.g. replacing credentials forks a fresh worker each
+     * time). Budget new persistent starts per IP, the one key a client cannot
+     * rotate.
+     * shortcut: fixed one-minute window allows a 2x burst at the boundary;
+     * switch to a sliding window if that burst matters.
+     */
+    private assertStartRate;
     private isProcessAlive;
 }
 export default ProcessManager;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sockethub/server",
   "description": "A polyglot messaging service, server libraries",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "type": "module",
   "private": false,
   "author": "Nick Jennings <nick@silverbucket.net>",
@@ -26,7 +26,7 @@
   "bin": "bin/sockethub",
   "preferGlobal": true,
   "engines": {
-    "node": ">=20"
+    "node": ">=20.19"
   },
   "keywords": [
     "sockethub",
@@ -53,11 +53,11 @@
   "dependencies": {
     "@sentry/node": "^10.36.0",
     "@sentry/profiling-node": "10.36.0",
-    "@sockethub/client": "^5.0.0-beta.1",
-    "@sockethub/data-layer": "^1.0.0-beta.1",
-    "@sockethub/logger": "^1.0.0-beta.1",
-    "@sockethub/schemas": "^3.0.0-beta.1",
-    "@sockethub/util": "^1.0.0-beta.1",
+    "@sockethub/client": "^5.0.0-beta.3",
+    "@sockethub/data-layer": "^1.0.0-beta.3",
+    "@sockethub/logger": "^1.0.0-beta.3",
+    "@sockethub/schemas": "^3.0.0-beta.3",
+    "@sockethub/util": "^1.0.0-beta.3",
     "chalk": "^5.6.2",
     "convict": "^6.2.5",
     "debug": "^4.4.3",
@@ -91,15 +91,19 @@
     "web-streams-polyfill": "^3.3.3"
   },
   "optionalDependencies": {
-    "@sockethub/examples": "^1.0.0-beta.1",
-    "@sockethub/platform-caldav": "^1.0.0-beta.1",
-    "@sockethub/platform-carddav": "^1.0.0-beta.1",
-    "@sockethub/platform-dummy": "^3.0.0-beta.1",
-    "@sockethub/platform-feeds": "^4.0.0-beta.1",
-    "@sockethub/platform-irc": "^4.0.0-beta.1",
-    "@sockethub/platform-metadata": "^1.0.1-beta.1",
-    "@sockethub/platform-xmpp": "^5.0.0-beta.1"
+    "@sockethub/examples": "^1.0.0-beta.3",
+    "@sockethub/platform-caldav": "^1.0.0-beta.3",
+    "@sockethub/platform-carddav": "^1.0.0-beta.3",
+    "@sockethub/platform-dummy": "^3.0.0-beta.3",
+    "@sockethub/platform-email": "^1.0.0-beta.3",
+    "@sockethub/platform-feeds": "^4.0.0-beta.3",
+    "@sockethub/platform-instagram": "^1.0.0-beta.3",
+    "@sockethub/platform-irc": "^4.0.0-beta.3",
+    "@sockethub/platform-messenger": "^1.0.0-beta.3",
+    "@sockethub/platform-metadata": "^1.0.1-beta.3",
+    "@sockethub/platform-whatsapp": "^1.0.0-beta.3",
+    "@sockethub/platform-xmpp": "^5.0.0-beta.3"
   },
-  "gitHead": "928f0c480e4828f492fb29a97712474a8f1bcaef",
+  "gitHead": "603d4edd90e1f0f0b70c4ab759be5f70b24020ea",
   "types": "./dist/index.d.ts"
 }