fix rooms, add discord bot

Author: 0x77dev

package.json

@@ -13,8 +13,9 @@
     "@dstack-js/lib": "^0.2.23",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
-    "@oclif/plugin-help": "^3",
+    "@oclif/plugin-help": "^5.1.10",
     "blessed": "^0.1.81",
+    "discord.js": "^13.6.0",
     "tslib": "^1",
     "wrtc": "^0.4.7"
   },
@@ -42,7 +43,11 @@
   "license": "GPL-3.0",
   "main": "lib/index.js",
   "oclif": {
-    "bin": "peerchat"
+    "commands": "./lib/commands",
+    "bin": "peerchat",
+    "plugins": [
+      "@oclif/plugin-help"
+    ]
   },
   "repository": "dstack-js/chat",
   "scripts": {

src/commands/discord/index.ts

@@ -0,0 +1,54 @@
+import {Command, flags} from '@oclif/command'
+import PeerChat from '..'
+import {getStack} from '../../services/stack'
+import Discord, {Intents} from 'discord.js'
+
+class DiscordRelay extends Command {
+  static description = 'Peerchat <-> Discord'
+
+  static flags = {
+    version: flags.version({char: 'v'}),
+  }
+
+  static examples = [
+    '$ peerchat discord',
+    '$ peerchat discord [ROOM]',
+    '$ peerchat discord dstack',
+  ]
+
+  static args = [{name: 'room', default: PeerChat.args[0].default, description: 'chat room'}]
+
+  async run() {
+    const {args} = this.parse(DiscordRelay)
+
+    if (!process.env.DISCORD_KEY) {
+      throw new Error('DISCORD_KEY env is missing')
+    }
+
+    const {pubsub} = await getStack()
+    const client = new Discord.Client({intents: [Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILDS, Intents.FLAGS.DIRECT_MESSAGES]})
+    await client.login(process.env.DISCORD_KEY)
+
+    client.on('message', async msg => {
+      if (msg.author.bot) return
+
+      await pubsub.publish(args.room, {nickname: msg.author.tag, message: msg.content})
+    })
+
+    await pubsub.subscribe(args.room, async event => {
+      const channel = await client.channels.fetch(process.env.CHANNEL_ID || '936448590170177556')
+
+      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+      // @ts-ignore
+      if (!channel || !channel.isText()) {
+        throw new Error('CHANNEL_ID env is invalid')
+      }
+
+      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+      // @ts-ignore
+      channel.send(`${event.data.nickname ? `${event.data.nickname} (${event.from.slice(-5)})` : event.from.slice(-5)}: ${event.data.message}`)
+    })
+  }
+}
+
+export = DiscordRelay

src/commands/index.ts

@@ -0,0 +1,23 @@
+import {Command, flags} from '@oclif/command'
+import {run} from '../services/chat'
+
+export default class PeerChat extends Command {
+  static description = 'Peer-to-peer terminal chat running on DStack'
+
+  static flags = {
+    version: flags.version({char: 'v'}),
+  }
+
+  static examples = [
+    '$ peerchat',
+    '$ peerchat [ROOM] [NICKNAME]',
+    '$ peerchat dstack myCoolNickname',
+  ]
+
+  static args = [{name: 'room', default: 'dstack', description: 'chat room'}, {name: 'nickname', description: 'your nickname'}]
+
+  async run() {
+    const {args} = this.parse(PeerChat)
+    await run(args.room, args.nickname)
+  }
+}

src/index.ts

@@ -1,25 +1 @@
-import {Command, flags} from '@oclif/command'
-import {run} from './chat'
-
-class DstackJsChat extends Command {
-  static description = 'start chat'
-
-  static flags = {
-    version: flags.version({char: 'v'}),
-  }
-
-  static examples = [
-    '$ peerchat',
-    '$ peerchat ROOM NICKNAME',
-    '$ peerchat dstack myCoolNickname',
-  ]
-
-  static args = [{name: 'room', default: 'dstack', description: 'chat room'}, {name: 'nickname', description: 'your nickname'}]
-
-  async run() {
-    const {args} = this.parse(DstackJsChat)
-    run(args.room, args.nickname)
-  }
-}
-
-export = DstackJsChat
+export {run} from '@oclif/command'

src/chat.ts renamed to src/services/chat.ts

@@ -1,45 +1,10 @@
-/* eslint-disable node/no-extraneous-import */
 /* eslint-disable no-process-exit */
 /* eslint-disable unicorn/no-process-exit */
-import {create} from '@dstack-js/ipfs'
-import {Stack} from '@dstack-js/lib'
-import {PubSub} from '@dstack-js/lib/src/pubsub'
-const wrtc = require('wrtc')
 import * as blessed from 'blessed'
-
-interface Message {
-  nickname?: string;
-  message: string;
-}
+import {getStack} from './stack'
 
 export const run = async (room: string, nickname?: string) => {
-  const ipfs = await create({
-    repo: process.env.IPFS_REPO,
-    relay: {
-      enabled: true, // enable relay dialer/listener (STOP)
-      hop: {
-        enabled: true, // make this node a relay (HOP)
-      },
-    },
-    config: {
-      Addresses: {
-        Swarm: ['/ip4/0.0.0.0/tcp/0', '/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star'],
-      },
-      Discovery: {
-        MDNS: {
-          Enabled: true,
-          Interval: 1,
-        },
-        webRTCStar: {
-          Enabled: true,
-        },
-      },
-      Bootstrap: ['/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star/p2p/QmV2uXBKbii29iJKHKVy8sx5m49qdDTBYNybVoa5uLJtrf'],
-    },
-  }, wrtc)
-
-  const stack = await Stack.create('dstack-chat', ipfs)
-  const pubsub = stack.pubsub as PubSub<Message>
+  const {ipfs, stack, pubsub} = await getStack()
 
   const screen = blessed.screen({
     smartCSR: true,
@@ -129,7 +94,7 @@ export const run = async (room: string, nickname?: string) => {
     }
 
     try {
-      await pubsub.publish('chat', {nickname, message})
+      await pubsub.publish(room, {nickname, message})
     } catch {
       // error handling
     } finally {
@@ -146,21 +111,14 @@ export const run = async (room: string, nickname?: string) => {
   screen.append(input)
   input.focus()
 
-  await pubsub.subscribe('chat', event => {
+  await pubsub.subscribe(room, event => {
     messageList.addItem(`${event.data.nickname ? `${event.data.nickname} (${event.from.slice(-5)})` : event.from.slice(-5)}: ${event.data.message}`)
     messageList.scrollTo(100)
     screen.render()
   })
 
-  stack.onPeerConnect(async peer => {
-    messageList.setLabel(` Messages #${room} - Peers: ${await pubsub.peers('chat')} `)
-    messageList.addItem(`dstack: peer connected ${peer.id.slice(-5)}`)
-    messageList.scrollTo(100)
-    screen.render()
-  })
-
   setInterval(async () => {
-    messageList.setLabel(` Messages #${room} - Peers: ${await pubsub.peers('chat')} `)
+    messageList.setLabel(` Messages #${room} - Peers: ${await pubsub.peers(room)} `)
     screen.render()
   }, 1000)
 

src/services/stack.ts

@@ -0,0 +1,44 @@
+import {create} from '@dstack-js/ipfs'
+import {Stack} from '@dstack-js/lib'
+import {PubSub} from '@dstack-js/lib/src/pubsub'
+const wrtc = require('wrtc')
+
+interface Message {
+  nickname?: string;
+  message: string;
+}
+
+export const getStack = async () => {
+  const ipfs = await create({
+    repo: process.env.IPFS_REPO,
+    init: {
+      privateKey: process.env.PEERCHAT_PRIVATE_KEY,
+    },
+    relay: {
+      enabled: true,
+      hop: {
+        enabled: true,
+      },
+    },
+    config: {
+      Addresses: {
+        Swarm: ['/ip4/0.0.0.0/tcp/0', '/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star'],
+      },
+      Discovery: {
+        MDNS: {
+          Enabled: true,
+          Interval: 1,
+        },
+        webRTCStar: {
+          Enabled: true,
+        },
+      },
+      Bootstrap: ['/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star/p2p/QmV2uXBKbii29iJKHKVy8sx5m49qdDTBYNybVoa5uLJtrf'],
+    },
+  }, wrtc)
+
+  const stack = await Stack.create('dstack-chat', ipfs)
+  const pubsub = stack.pubsub as PubSub<Message>
+
+  return {pubsub, stack, ipfs}
+}