@helyx/bot 0.4.31 → 0.4.33

package/dist/shard-supervisor.js

@@ -22,6 +22,7 @@ import { ShardControlRouter } from "./shard-router.js";
 import { createDeveloperOperationsModule } from "./developer-operations-module.js";
 import { SupervisorCloudDiscordDirectory } from "./supervisor-cloud-directory.js";
 import { createSupportModule } from "./support-module.js";
+import { createOAuthModule } from "./oauth-module.js";
 import { createScheduledTaskRunner, schedulerOperationalHealth, } from "./scheduled-task-runner.js";
 import { numericWriteBehindRegistrations } from "./numeric-write-behind.js";
 import { executeRedisNumericOperation, RedisNumericWriteBehindService, } from "./numeric-write-behind-redis.js";
@@ -187,10 +188,14 @@ export async function startShardSupervisor(environment, processEnvironment, work
             })
             : undefined;
         const supportModule = createSupportModule(cloudConnector);
+        const oauthModule = environment.HELYX_OAUTH_ENABLED
+            ? createOAuthModule()
+            : undefined;
         const publicModules = [
             managementModule,
             permissionsModule,
             supportModule,
+            ...(oauthModule ? [oauthModule] : []),
             ...(cloudManagementModule ? [cloudManagementModule] : []),
             ...featureModules,
         ];
@@ -210,6 +215,7 @@ export async function startShardSupervisor(environment, processEnvironment, work
                     managementModule,
                     permissionsModule,
                     supportModule,
+                    ...(oauthModule ? [oauthModule] : []),
                     ...(cloudManagementModule ? [cloudManagementModule] : []),
                 ].map(({ manifest }) => manifest),
                 modules: featureModules.map(({ manifest }) => manifest),
@@ -645,7 +651,22 @@ export async function startShardSupervisor(environment, processEnvironment, work
             }
         }
         assertShardMessageSize(response);
-        await workers.get(shardId)?.send(response);
+        await sendWorkerResponse(shardId, response);
+    }
+    async function sendWorkerResponse(shardId, response) {
+        if (shuttingDown)
+            return;
+        const worker = workers.get(shardId);
+        if (!worker?.process)
+            return;
+        try {
+            await worker.send(response);
+        }
+        catch (error) {
+            if (shuttingDown || !worker.process)
+                return;
+            throw error;
+        }
     }
     async function handleWorkerMessage(shardId, raw) {
         if (serializedBytes(raw) > SHARD_CONTROL_MAX_BYTES)
@@ -703,7 +724,7 @@ export async function startShardSupervisor(environment, processEnvironment, work
             const response = leaderLease
                 ? await executeLeaderCloud(message.data)
                 : await routeCloudToLeader(message.data);
-            await workers.get(shardId)?.send(response);
+            await sendWorkerResponse(shardId, response);
             return;
         }
         if (message.data.type === "helyx.operations.health.request") {
@@ -714,7 +735,7 @@ export async function startShardSupervisor(environment, processEnvironment, work
                 health: boundedOperationalHealth(await buildHealth()),
             };
             assertShardMessageSize(response);
-            await workers.get(shardId)?.send(response);
+            await sendWorkerResponse(shardId, response);
         }
     }
     function dispatchLocal(shardId, request) {
@@ -1386,9 +1407,14 @@ export function buildShardWorkerEnvironment(source, identity, restartCount) {
         "HELYX_SUPPORT_STAFF_CHANNEL_ID",
         "HELYX_MODULE_PACKAGES",
         "HELYX_MESSAGE_CONTENT_ENABLED",
+        "HELYX_GUILD_MEMBERS_ENABLED",
+        "HELYX_GUILD_RECONCILIATION_INTERVAL_SECONDS",
         "HELYX_MODULE_CATALOGUE_PATH",
         "HELYX_CLOUD_CONNECT_ENABLED",
+        "HELYX_CLOUD_API_URL",
         "HELYX_OWNER_USER_IDS",
+        "HELYX_OAUTH_ENABLED",
+        "HELYX_OAUTH_INTERNAL_SECRET",
         "HELYX_VERIFICATION_ENABLED",
         "HELYX_VERIFICATION_INSTALLATION_ID",
         "HELYX_VERIFICATION_URL",

package/dist/shard-worker.d.ts

@@ -34,6 +34,7 @@ export declare function parseShardWorkerEnvironment(processEnvironment: NodeJS.P
     APPROVED_ROLES: string[];
     HELYX_MODULE_PACKAGES: string[];
     HELYX_MODULE_CATALOGUE_PATH: string | undefined;
+    HELYX_DASHBOARD_PUBLIC_URL: string;
     HELYX_SUPPORT_STAFF_CHANNEL_ID: string | undefined;
     HELYX_VERIFICATION_ENABLED: boolean;
     HELYX_VERIFICATION_SIGNING_PUBLIC_KEYS: Record<string, string>;
@@ -41,10 +42,12 @@ export declare function parseShardWorkerEnvironment(processEnvironment: NodeJS.P
     HELYX_GUILD_RECONCILIATION_INTERVAL_SECONDS: number;
     HELYX_PRIVACY_ENABLED: boolean;
     HELYX_MESSAGE_CONTENT_ENABLED: boolean;
+    HELYX_GUILD_MEMBERS_ENABLED: boolean;
     HELYX_CLOUD_CONNECT_ENABLED: boolean;
     HELYX_CLOUD_ENROLMENT_TOKEN: string | undefined;
     HELYX_CLOUD_ENROLMENT_FILE: string;
     HELYX_CLOUD_API_URL: string;
+    HELYX_OAUTH_ENABLED: boolean;
     HELYX_CLOUD_ENDPOINT: string;
     HELYX_OWNER_USER_IDS: string[];
     HELYX_SHARD_MODE: "off" | "auto" | "fixed";
@@ -60,6 +63,7 @@ export declare function parseShardWorkerEnvironment(processEnvironment: NodeJS.P
     HELYX_VERIFICATION_INTERNAL_SECRET?: string | undefined;
     HELYX_PRIVACY_EXECUTOR_DATABASE_URL?: string | undefined;
     HELYX_PRIVACY_EXECUTOR_DATABASE_SSL?: "disable" | "require" | "verify-full" | undefined;
+    HELYX_OAUTH_INTERNAL_SECRET?: string | undefined;
     HELYX_SHARD_COUNT?: number | undefined;
     HELYX_SHARD_REDIS_URL?: string | undefined;
     HELYX_SHARD_REDIS_NAMESPACE?: string | undefined;
@@ -71,5 +75,6 @@ export declare function shardWorkerCommandRegistration(input: {
     prepare: NonNullable<CommandRegistration["prepare"]>;
     operationsModuleId?: string;
     supportModuleId: string;
+    oauthModuleId?: string;
 }): CommandRegistration;
 //# sourceMappingURL=shard-worker.d.ts.map

package/dist/shard-worker.js

@@ -20,11 +20,14 @@ import { loadConfiguredModulePackages, platformServiceOptions, secureRandomSelec
 import { createPermissionsModule } from "./permissions-module.js";
 import { WorkerCloudConnectorProxy } from "./shard-cloud-proxy.js";
 import { DiscordOwnedMessageDeletionService } from "./discord-owned-message-service.js";
+import { DiscordGuildHealthInspection } from "./discord-guild-health.js";
 import { CoreResourceAuthorizationService } from "./resource-authorization.js";
 import { createDeveloperOperationsModule, WorkerShardHealthProvider, } from "./developer-operations-module.js";
 import { assertShardMessageSize, controlOperationGuildId, executeShardControlOperation, guildIdToShardId, SHARD_LEASE_HEARTBEAT_TIMEOUT_MS, shardIdentitySchema, supervisorMessageSchema, } from "./shard-contracts.js";
 import { gatewayIntentsForModules, readBotVersion, } from "./index.js";
 import { createSupportModule } from "./support-module.js";
+import { createOAuthModule } from "./oauth-module.js";
+import { HttpOAuthService } from "./oauth-service.js";
 import { createLocalScheduledTaskRoute, } from "./scheduled-task-runner.js";
 import { createLocalNumericWriteBehind } from "./numeric-write-behind.js";
 import { WorkerNumericWriteBehindProxy } from "./numeric-write-behind-proxy.js";
@@ -111,7 +114,7 @@ export async function startShardWorker(processEnvironment = process.env, identit
         const modulePackages = await loadConfiguredModulePackages(moduleSpecifiers);
         const featureModules = modulePackages.map(({ definition }) => definition);
         client = new Client({
-            intents: gatewayIntentsForModules(featureModules, environment.HELYX_MESSAGE_CONTENT_ENABLED),
+            intents: gatewayIntentsForModules(featureModules, environment.HELYX_MESSAGE_CONTENT_ENABLED, environment.HELYX_GUILD_MEMBERS_ENABLED),
             partials: [Partials.Message, Partials.Channel, Partials.Reaction],
             allowedMentions: { parse: [] },
             shards: [identity.shardId],
@@ -130,10 +133,14 @@ export async function startShardWorker(processEnvironment = process.env, identit
             })
             : undefined;
         const supportModule = createSupportModule(cloudProxy);
+        const oauthModule = environment.HELYX_OAUTH_ENABLED
+            ? createOAuthModule()
+            : undefined;
         const publicModules = [
             managementModule,
             permissionsModule,
             supportModule,
+            ...(oauthModule ? [oauthModule] : []),
             ...(cloudManagementModule ? [cloudManagementModule] : []),
             ...featureModules,
         ];
@@ -152,6 +159,7 @@ export async function startShardWorker(processEnvironment = process.env, identit
                     managementModule,
                     permissionsModule,
                     supportModule,
+                    ...(oauthModule ? [oauthModule] : []),
                     ...(cloudManagementModule ? [cloudManagementModule] : []),
                 ].map(({ manifest }) => manifest),
                 modules: featureModules.map(({ manifest }) => manifest),
@@ -182,6 +190,9 @@ export async function startShardWorker(processEnvironment = process.env, identit
             }));
             platformServices.set(HELYX_SERVICE_NAMES.verificationMembers, new DiscordVerificationMemberService(client));
         }
+        if (environment.HELYX_OAUTH_ENABLED &&
+            environment.HELYX_OAUTH_INTERNAL_SECRET)
+            platformServices.set(HELYX_SERVICE_NAMES.oauth, new HttpOAuthService(environment.HELYX_CLOUD_API_URL, environment.HELYX_OAUTH_INTERNAL_SECRET));
         numericWriteBehind =
             identity.scope === "coordinated"
                 ? new WorkerNumericWriteBehindProxy(identity)
@@ -193,6 +204,7 @@ export async function startShardWorker(processEnvironment = process.env, identit
         platformServices.set(HELYX_SERVICE_NAMES.memberEnforcement, new DiscordMemberEnforcementService(client));
         platformServices.set(HELYX_SERVICE_NAMES.memberRoles, new DiscordMemberRoleService(client));
         platformServices.set(HELYX_SERVICE_NAMES.discordResources, new DiscordResourceInspection(client));
+        platformServices.set(HELYX_SERVICE_NAMES.discordGuildHealth, new DiscordGuildHealthInspection(client, publicModules, serviceAccess));
         if (featureModules.some(({ manifest }) => manifest.id === "helyx.logging"))
             platformServices.set(HELYX_SERVICE_NAMES.moduleLogging, new DiscordModuleLoggingService(client, database, publicModules, logger));
         const scheduledTaskRoute = createLocalScheduledTaskRoute({
@@ -205,6 +217,7 @@ export async function startShardWorker(processEnvironment = process.env, identit
             managementModule.manifest.id,
             permissionsModule.manifest.id,
             supportModule.manifest.id,
+            ...(oauthModule ? [oauthModule.manifest.id] : []),
             ...(cloudManagementModule ? [cloudManagementModule.manifest.id] : []),
             ...(operationsModule ? [operationsModule.manifest.id] : []),
         ]);
@@ -226,6 +239,7 @@ export async function startShardWorker(processEnvironment = process.env, identit
                 ? { operationsModuleId: operationsModule.manifest.id }
                 : {}),
             supportModuleId: supportModule.manifest.id,
+            ...(oauthModule ? { oauthModuleId: oauthModule.manifest.id } : {}),
         }), logger, serviceAccess);
         moduleEvents = installModuleEvents(client, publicModules, logger, serviceAccess);
         const controlService = new BotControlService(database, publicModules, guildResources, serviceAccess, undefined, environment.DISCORD_INTERNAL_GUILD_ID &&
@@ -419,6 +433,7 @@ export function shardWorkerCommandRegistration(input) {
         synchronise: false,
         selfAuthorizingGuildModuleIds: new Set([
             input.supportModuleId,
+            ...(input.oauthModuleId ? [input.oauthModuleId] : []),
             ...(input.operationsModuleId ? [input.operationsModuleId] : []),
         ]),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helyx/bot",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "Production Discord runtime for the modular Helyx platform.",
   "keywords": [
     "helyx",