clustering

.vscode/launch.json

@@ -5,7 +5,7 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Launch Program - TSC Compiled",
+      "name": "Cluster - TSC Compiled",
       "program": "${workspaceFolder}/dist/index.js",
       "request": "launch",
       "skipFiles": [
@@ -19,7 +19,7 @@
       "type": "pwa-node"
     },
     {
-      "name": "Launch Program - ts-node with Debugger",
+      "name": "Cluster - ts-node with Debugger",
       "type": "pwa-node",
       "request": "launch",
       "runtimeArgs": [
@@ -31,6 +31,34 @@
       "args": [
           "${workspaceFolder}/src/index.ts"
       ]
-    }  
+    },
+    {
+      "name": "Plain - TSC Compiled",
+      "program": "${workspaceFolder}/dist/entry.js",
+      "request": "launch",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "runtimeArgs": [
+        "-r",
+        "dotenv/config"
+      ],
+      "preLaunchTask": "tsc: build - tsconfig.json",
+      "type": "pwa-node"
+    },
+    {
+      "name": "Plain - ts-node with Debugger",
+      "type": "pwa-node",
+      "request": "launch",
+      "runtimeArgs": [
+          "-r",
+          "ts-node/register",
+          "-r",
+          "dotenv/config"
+      ],
+      "args": [
+          "${workspaceFolder}/src/entry.ts"
+      ]
+    },
   ]
 }

package.json

@@ -6,6 +6,7 @@
   "main": "dist/index.js",
   "scripts": {
     "start": "node --enable-source-maps -r dotenv/config dist/index.js",
+    "start:plain": "node --enable-source-maps -r dotenv/config dist/entry.js",
     "test": "eslint src/**/*.ts",
     "lint": "eslint src/**/*.ts --fix",
     "compile": "tsc",

src/entry.ts

@@ -0,0 +1,32 @@
+import { fatal, info } from './utils/logger'
+import client from './structures/client'
+import * as Sentry from '@sentry/node'
+import { RewriteFrames } from '@sentry/integrations'
+import { promisify } from 'util'
+import { exec } from 'child_process'
+import dirImport from './utils/dir-import'
+
+info('Starting up...', 'Preflight');
+
+(async () => {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const revision = (await promisify(exec)('git rev-parse HEAD').catch(() => { return { stdout: require('../package.json').version } })).stdout.toString().trim()
+  info(`Initialzing Sentry, using revision ${revision as string}`, 'Preflight')
+  Sentry.init({
+    dsn: process.env.SENTRY_DSN,
+    integrations: function (integrations) {
+      return integrations
+        .concat(new RewriteFrames({ root: __dirname ?? process.cwd() }))
+        .filter(function (integration) {
+          return integration.name !== 'Console'
+        })
+    },
+    release: revision
+  })
+  await dirImport('@(dist|src)/languages/**/*.[?jt]s')
+  await dirImport('@(dist|src)/events/**/*.[?jt]s')
+  await client.addMultipleIn('./interactions')
+  await client.run()
+  await dirImport('@(dist|src)/jobs/**/*.client.[?jt]s')
+  await client.checkAndUploadCommands()
+})().catch(e => fatal(e, 'Startup'))

src/index.ts

@@ -1,31 +1,18 @@
-import { fatal, info } from './utils/logger'
-import client from './structures/client'
-import * as Sentry from '@sentry/node'
-import { RewriteFrames } from '@sentry/integrations'
-import { promisify } from 'util'
-import { exec } from 'child_process'
+import cluster from './structures/cluster'
 import dirImport from './utils/dir-import'
+import { fatal, info, warn } from './utils/logger'
 
-info('Starting up...', 'Preflight');
+cluster.on('clusterProcess', (payload) => {
+  payload.clusterProcess.on('ready', () => {
+    info('Cluster has reported ready', `Cluster ${payload.clusterProcess.clusterId}`)
+  })
+  payload.clusterProcess.on('warn', ctx => {
+    warn(ctx.error, `Cluster ${payload.clusterProcess.clusterId}`)
+  })
+});
 
 (async () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const revision = (await promisify(exec)('git rev-parse HEAD').catch(() => { return { stdout: require('../package.json').version } })).stdout.toString().trim()
-  info(`Initialzing Sentry, using revision ${revision as string}`, 'Preflight')
-  Sentry.init({
-    dsn: process.env.SENTRY_DSN,
-    integrations: function (integrations) {
-      return integrations
-        .concat(new RewriteFrames({ root: __dirname ?? process.cwd() }))
-        .filter(function (integration) {
-          return integration.name !== 'Console'
-        })
-    },
-    release: revision
-  })
-  await dirImport('@(dist|src)/languages/**/*.[?jt]s')
-  await dirImport('@(dist|src)/events/**/*.[?jt]s')
-  await client.addMultipleIn('./interactions')
-  await client.run()
-  await client.checkAndUploadCommands()
-})().catch(e => fatal(e, 'Startup'))
+  await cluster.run()
+  info(`Now running ${cluster.clusterCount} clusters with ${cluster.shardsPerCluster} shards on each one`, 'Clustering')
+  await dirImport('@(dist|src)/jobs/**/*.cluster.[?jt]s')
+})().catch(e => fatal(e, 'Clustering'))

src/structures/client.ts

@@ -15,10 +15,4 @@ const client = new InteractionCommandClient(process.env.BOT_TOKEN ?? '', {
   }
 }) as ModClient
 
-if ((process.env.WILDBEAST_SHARDING_START != null) && (process.env.WILDBEAST_SHARDING_END != null) && (process.env.WILDBEAST_SHARDING_TOTAL != null)) {
-  client.client.setShardCount(+process.env.WILDBEAST_SHARDING_TOTAL)
-  client.client.setShardStart(+process.env.WILDBEAST_SHARDING_START)
-  client.client.setShardEnd(+process.env.WILDBEAST_SHARDING_END)
-}
-
 export default client

src/structures/cluster.ts

@@ -0,0 +1,10 @@
+import { ClusterManager } from 'detritus-client'
+
+const IS_TS_NODE = Symbol.for('ts-node.register.instance') in process
+
+// the filename is NOT relative to this file
+// but to where the file is being run first
+// which in this case is the index.ts file
+const manager = new ClusterManager(IS_TS_NODE ? './entry.ts' : './entry.js', process.env.BOT_TOKEN ?? '')
+
+export default manager