dankgrinder 8.54.0 → 8.57.0

package/lib/grinder.js

@@ -2002,11 +2002,25 @@ class AccountWorker {
 
       // Set up error/disconnect handlers for auto-recovery
       this._attachRecoveryListeners();
-      rawLogger.attachRawLogger(this.client, { channelId: this.account.channel_id });
+      rawLogger.attachRawLogger(this.client, { channelId: this.channel?.id || this.account.channel_id || '' });
       rawLogger.attachDmLogger(this.client);
 
-      await this.client.login(this.account.discord_token);
-      this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+      // DM mode: resolve Dank Memer DM after login
+      if (isDMMode) {
+        const recoveryLoginToken = this.account.access_token || this.account.discord_token;
+        await this.client.login(recoveryLoginToken);
+        try {
+          const dankUser = await this.client.users.fetch(DANK_MEMER_ID);
+          this.channel = await dankUser.createDM();
+          this._dmChannelId = this.channel.id;
+          this.log('info', `DM re-opened with Dank Memer`);
+        } catch (err) {
+          this.log('error', `Failed to re-open DM: ${err?.message || err}`);
+        }
+      } else {
+        await this.client.login(this.account.discord_token);
+        this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+      }
 
       if (this.channel) {
         this._recoveryAttempts = 0;
@@ -2486,8 +2500,13 @@ class AccountWorker {
     } else {
       process.stdout.write(`[WORKER START] ${this.account.label || this.account.id}\n`);
     }
-    if (!this.account.discord_token) { this.log('error', 'No token'); return; }
-    if (!this.account.channel_id) { this.log('error', 'No channel'); return; }
+    if (!this.account.discord_token && !this.account.access_token) { this.log('error', 'No token or access token'); return; }
+    if (!this.account.channel_id && this.account.grind_mode !== 'dm') { this.log('error', 'No channel'); return; }
+
+    // Determine login token: OAuth access_token takes priority over discord_token
+    const loginToken = this.account.access_token || this.account.discord_token;
+    const grindMode = this.account.grind_mode || 'channel';
+    const isDMMode = grindMode === 'dm';
 
     const LOGIN_TIMEOUT_MS = 30_000; // 30s max per account login
 
@@ -2512,8 +2531,8 @@ class AccountWorker {
         this.loggedIn = true; // so statusColor/statusText show correct state
 
         // Attach raw gateway logger for CV2 component capture
-        rawLogger.attachRawLogger(this.client, { channelId: this.account.channel_id });
-      rawLogger.attachDmLogger(this.client);
+        rawLogger.attachRawLogger(this.client, { channelId: this.channel?.id || '' });
+        rawLogger.attachDmLogger(this.client);
 
         // Report status non-blocking
         fetch(`${API_URL}/api/grinder/status`, {
@@ -2522,10 +2541,23 @@ class AccountWorker {
           body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl, userId: this.account.userId }),
         }).catch(() => {});
 
-        this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
-        if (!this.channel) {
-          this.log('error', `Channel not found`);
-          done(); return;
+        // Resolve grinding channel: DM mode opens DM with Dank Memer, otherwise use configured channel
+        if (isDMMode) {
+          try {
+            const dankUser = await this.client.users.fetch(DANK_MEMER_ID);
+            this.channel = await dankUser.createDM();
+            this._dmChannelId = this.channel.id;
+            this.log('info', `DM opened with Dank Memer`);
+          } catch (err) {
+            this.log('error', `Failed to open DM: ${err?.message || err}`);
+            done(); return;
+          }
+        } else {
+          this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+          if (!this.channel) {
+            this.log('error', `Channel not found`);
+            done(); return;
+          }
         }
 
         const enabledCmds = [
@@ -2574,7 +2606,7 @@ class AccountWorker {
 
       // Attach auto-recovery event listeners before login
       this._attachRecoveryListeners();
-      this.client.login(this.account.discord_token).catch((err) => {
+      this.client.login(loginToken).catch((err) => {
         clearTimeout(timeoutId);
         const msg = (err?.message || '').toLowerCase();
         if (msg.includes('token_invalid') || msg.includes('invalid token') || msg.includes('401') || msg.includes('incorrect login')) {
@@ -2638,11 +2670,17 @@ class AccountWorker {
         this.client.destroy();
         this.client = createLeanClient();
         this._attachRecoveryListeners();
-        await this.client.login(this.account.discord_token);
-        this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
-        if (this.channel) {
-          this.username = this.client.user?.tag || this.username;
-          this.log('success', `Background login OK`);
+        const retryToken = this.account.access_token || this.account.discord_token;
+        await this.client.login(retryToken);
+        // DM mode: re-open DM with Dank Memer
+        if (this.account.grind_mode === 'dm') {
+          const dankUser = await this.client.users.fetch(DANK_MEMER_ID);
+          this.channel = await dankUser.createDM();
+          this._dmChannelId = this.channel.id;
+          this.log('success', `Background login OK (DM)`);
+        } else {
+          this.channel = await this.client.channels.fetch(this.account.channel_id).catch(() => null);
+          if (this.channel) this.log('success', `Background login OK`);
         }
       } catch (err) {
         this.log('error', `Background login failed: ${err?.message || err}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dankgrinder",
-  "version": "8.54.0",
+  "version": "8.57.0",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"