@helyx/bot 0.4.33 → 0.4.35

package/dist/permissions-module.js

@@ -1,4 +1,5 @@
 import { defineModule, HELYX_SERVICE_NAMES, } from "@helyx/sdk";
+import { isCustomerSelectableModule } from "@helyx/module-manifest";
 import { PermissionFlagsBits } from "discord.js";
 import { canMutatePermissionPolicy, permissionMutationDenialMessage, } from "@helyx/core";
 const MODULE_SELECT_ID = "helyx.permissions.module";
@@ -17,7 +18,9 @@ const MODULE_PAGE_SIZE = 25;
 const TARGET_PAGE_SIZE = 24;
 const VIOLET = 0x7c3aed;
 export function createPermissionsModule(configurableModules) {
-    const modules = new Map(configurableModules.map((module) => [module.manifest.id, module]));
+    const modules = new Map(configurableModules
+        .filter((module) => isCustomerSelectableModule(module.manifest))
+        .map((module) => [module.manifest.id, module]));
     const commandModules = [...modules.values()]
         .filter((module) => commandTargets(module).length > 0)
         .sort((left, right) => left.manifest.name.localeCompare(right.manifest.name, "en-GB"));
@@ -46,6 +49,7 @@ export function createPermissionsModule(configurableModules) {
                 {
                     name: "permissions",
                     description: "Configure access to Helyx modules and commands",
+                    acknowledgement: "deferred-ephemeral",
                     registration: "global",
                     contexts: ["guild"],
                     integrationTypes: ["guild_install"],
@@ -359,9 +363,17 @@ function restrictedPolicy() {
     };
 }
 function commandTargets(module) {
-    return (module.interactions?.commands ?? []).flatMap((command) => command.subcommands?.length
-        ? command.subcommands.map((subcommand) => `${command.name}.${subcommand.name}`)
-        : [command.name]);
+    const targets = (module.interactions?.commands ?? []).flatMap((command) => {
+        const nested = [
+            ...(command.subcommands ?? []).map((subcommand) => `${command.name}.${subcommand.name}`),
+            ...(command.subcommandGroups ?? []).flatMap((group) => group.subcommands.map((subcommand) => `${command.name}.${group.name}.${subcommand.name}`)),
+        ];
+        if (nested.length > 0)
+            return nested;
+        return [command.name];
+    });
+    targets.push(...(module.nexusCommands ?? []).map((command) => `nexus.${command.path}`));
+    return [...new Set(targets)];
 }
 function modulePickerResponse(modules, requestedPage) {
     const pages = pageCount(modules.length, MODULE_PAGE_SIZE);

package/dist/scheduled-task-runner.js

@@ -321,6 +321,13 @@ export function createLocalScheduledTaskRoute(input) {
         const module = modules.get(task.moduleId);
         if (!module)
             return deferred("module_unavailable", DEFAULT_POLL_INTERVAL_MS * 30);
+        if (typeof input.services.has === "function" &&
+            input.services.has(HELYX_SERVICE_NAMES.moduleAvailability)) {
+            const availability = input.services.get(HELYX_SERVICE_NAMES.moduleAvailability);
+            if (typeof availability?.isAvailable === "function" &&
+                !(await availability.isAvailable(task.moduleId)))
+                return deferred("module_globally_disabled", DEFAULT_POLL_INTERVAL_MS * 30);
+        }
         if (task.guildId) {
             const enabled = await input.services
                 .get(HELYX_SERVICE_NAMES.installations)

package/dist/shard-router.d.ts

@@ -11,11 +11,13 @@ export declare class ShardControlRouter implements BotControlHandler {
         localLeases: ReadonlyMap<number, ShardLease>;
         dispatchLocal: LocalDispatcher;
         privacy?: Pick<BotControlHandler, "listPrivacyProviders" | "capturePrivacy" | "erasePrivacy">;
+        availability?: Pick<BotControlHandler, "listAvailabilityModules">;
         localLeaderLease?: ShardLeaderLease;
         coordinator?: ShardCoordinator;
         notificationGuildId?: string;
     });
     cleanupOAuthConsumer(input: Parameters<BotControlHandler["cleanupOAuthConsumer"]>[0]): ReturnType<BotControlHandler["cleanupOAuthConsumer"]>;
+    listAvailabilityModules(): ReturnType<BotControlHandler["listAvailabilityModules"]>;
     getGuildState(guildId: string): ReturnType<BotControlHandler["getGuildState"]>;
     canAccessDashboard(input: Parameters<BotControlHandler["canAccessDashboard"]>[0]): ReturnType<BotControlHandler["canAccessDashboard"]>;
     getGuildAccessPolicy(input: Parameters<BotControlHandler["getGuildAccessPolicy"]>[0]): ReturnType<BotControlHandler["getGuildAccessPolicy"]>;

package/dist/shard-router.js

@@ -15,6 +15,11 @@ export class ShardControlRouter {
     cleanupOAuthConsumer(input) {
         return this.#route({ kind: "oauth.consumer.cleanup", ...input });
     }
+    listAvailabilityModules() {
+        if (!this.input.availability)
+            return Promise.reject(new BotControlTransportError(503, "Module availability catalogue is unavailable"));
+        return this.input.availability.listAvailabilityModules();
+    }
     getGuildState(guildId) {
         return this.#route({ kind: "guild.state.get", guildId });
     }

package/dist/shard-supervisor.js

@@ -23,6 +23,7 @@ import { createDeveloperOperationsModule } from "./developer-operations-module.j
 import { SupervisorCloudDiscordDirectory } from "./supervisor-cloud-directory.js";
 import { createSupportModule } from "./support-module.js";
 import { createOAuthModule } from "./oauth-module.js";
+import { availabilityCatalogue, availabilityCatalogueDefinitions, } from "./module-availability-control.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";
@@ -229,6 +230,10 @@ export async function startShardSupervisor(environment, processEnvironment, work
             ...publicModules,
             ...(operationsModule ? [operationsModule] : []),
         ];
+        const availabilityModules = availabilityCatalogueDefinitions(modules);
+        const availabilityService = {
+            listAvailabilityModules: () => availabilityCatalogue(availabilityModules),
+        };
         const initialiseLeader = async () => {
             await runLeaderStartup(database, environment, modulePackages, modules, logger);
             assertStartupLeaseHealthy();
@@ -258,6 +263,7 @@ export async function startShardSupervisor(environment, processEnvironment, work
                 localLeases,
                 dispatchLocal,
                 privacy: privacyService,
+                availability: availabilityService,
                 localLeaderLease: leaderLease,
                 ...(coordinator ? { coordinator } : {}),
                 ...(environment.DISCORD_INTERNAL_GUILD_ID
@@ -351,6 +357,7 @@ export async function startShardSupervisor(environment, processEnvironment, work
             localLeases,
             dispatchLocal,
             ...(privacyService ? { privacy: privacyService } : {}),
+            availability: availabilityService,
             ...(leaderLease ? { localLeaderLease: leaderLease } : {}),
             ...(coordinator ? { coordinator } : {}),
             ...(environment.DISCORD_INTERNAL_GUILD_ID

package/dist/shard-worker.d.ts

@@ -9,7 +9,7 @@ export declare function createLeaseHeartbeatWatchdog(onExpired: () => void, time
 };
 export declare function startShardWorker(processEnvironment?: NodeJS.ProcessEnv, identity?: {
     version: 1;
-    mode: "auto" | "fixed";
+    mode: "fixed" | "auto";
     scope: "local" | "coordinated";
     generation: string;
     supervisorId: string;
@@ -50,12 +50,15 @@ export declare function parseShardWorkerEnvironment(processEnvironment: NodeJS.P
     HELYX_OAUTH_ENABLED: boolean;
     HELYX_CLOUD_ENDPOINT: string;
     HELYX_OWNER_USER_IDS: string[];
-    HELYX_SHARD_MODE: "off" | "auto" | "fixed";
+    HELYX_SHARD_MODE: "fixed" | "off" | "auto";
     HELYX_SHARD_SCOPE: "local" | "coordinated";
     HELYX_CLOUD_AUDIT_RETENTION_DAYS: number;
     HELYX_CLOUD_CREDENTIAL_AUDIT_RETENTION_DAYS: number;
     LOG_LEVEL: "error" | "fatal" | "warn" | "info" | "debug" | "trace" | "silent";
     NODE_ENV: "development" | "test" | "production";
+    HELYX_STATUS_ENABLED: boolean;
+    HELYX_STATUS_URL: string;
+    HELYX_STATUS_HEARTBEAT_INTERVAL_SECONDS: number;
     HELYX_BOT_CONTROL_SECRET?: string | undefined;
     HELYX_SUPPORT_SERVICE_SECRET?: string | undefined;
     HELYX_VERIFICATION_INSTALLATION_ID?: string | undefined;
@@ -69,6 +72,9 @@ export declare function parseShardWorkerEnvironment(processEnvironment: NodeJS.P
     HELYX_SHARD_REDIS_NAMESPACE?: string | undefined;
     HELYX_SHARD_GENERATION?: string | undefined;
     HELYX_SHARD_DATABASE_CONNECTION_BUDGET?: number | undefined;
+    HELYX_STATUS_HEARTBEAT_SECRET?: string | undefined;
+    CF_ACCESS_CLIENT_ID?: string | undefined;
+    CF_ACCESS_CLIENT_SECRET?: string | undefined;
 };
 export declare function shardWorkerCommandRegistration(input: {
     internalGuildId?: string;

package/dist/shard-worker.js

@@ -3,7 +3,7 @@ import { safeError, ServiceRegistry } from "@helyx/core";
 import { checkDatabaseConnection, createDatabasePool } from "@helyx/database";
 import { createRuntime } from "@helyx/framework";
 import { createPlatformServices } from "@helyx/platform";
-import { HELYX_SERVICE_NAMES } from "@helyx/sdk";
+import { HELYX_SERVICE_NAMES, } from "@helyx/sdk";
 import { Client, Events, Partials } from "discord.js";
 import { monitorEventLoopDelay } from "node:perf_hooks";
 import pino from "pino";
@@ -179,6 +179,9 @@ export async function startShardWorker(processEnvironment = process.env, identit
         })) {
             platformServices.set(name, service);
         }
+        await serviceAccess
+            .get(HELYX_SERVICE_NAMES.moduleAvailability)
+            .refresh();
         if (environment.HELYX_VERIFICATION_ENABLED &&
             environment.HELYX_VERIFICATION_URL &&
             environment.HELYX_VERIFICATION_INTERNAL_SECRET) {

package/dist/support-module.js

@@ -28,6 +28,7 @@ export function createSupportModule(transport) {
                 {
                     name: "bug",
                     description: "Report a Helyx bug to the support team",
+                    acknowledgement: "immediate-modal",
                     registration: "global",
                     contexts: ["guild"],
                     integrationTypes: ["guild_install"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helyx/bot",
-  "version": "0.4.33",
+  "version": "0.4.35",
   "description": "Production Discord runtime for the modular Helyx platform.",
   "keywords": [
     "helyx",
@@ -53,9 +53,10 @@
     "@helyx/core": ">=0.1.0 <0.2.0",
     "@helyx/database": ">=0.8.0 <0.9.0",
     "@helyx/framework": ">=0.1.0 <0.2.0",
-    "@helyx/module-manifest": ">=0.6.0 <0.7.0",
-    "@helyx/platform": ">=0.5.0 <0.6.0",
-    "@helyx/sdk": ">=0.7.0 <0.8.0",
+    "@helyx/module-manifest": ">=0.7.0 <0.8.0",
+    "@helyx/platform": ">=0.6.0 <0.7.0",
+    "@helyx/sdk": ">=0.8.0 <0.9.0",
+    "@helyx/status-client": ">=0.1.0 <0.2.0",
     "@helyx/verification-contracts": ">=0.3.0 <0.4.0",
     "discord.js": "14.27.0",
     "fastify": "5.10.0",