chore(dstack): upgrade to v0.2.33

Author: 0x77dev

package.json

@@ -7,17 +7,18 @@
     "peerchat": "./bin/run",
     "pchat": "./bin/run"
   },
-  "resolutions": {
-    "wrtc": "git+https://github.com/dstack-js/node-webrtc.git"
-  },
   "bugs": "https://github.com/dstack-js/chat/issues",
   "dependencies": {
-    "@dstack-js/ipfs": "^0.2.29",
-    "@dstack-js/lib": "^0.2.25",
+    "@dstack-js/ipfs": "^0.2.33",
+    "@dstack-js/lib": "^0.2.33",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "blessed": "^0.1.81",
     "discord.js": "^13.6.0",
+    "graphql": "^16.3.0",
+    "graphql-request": "^4.0.0",
+    "libp2p-webrtc-star": "0.20.1",
+    "libp2p-websockets": "0.15.0",
     "tslib": "^1",
     "wrtc": "^0.4.7"
   },

src/commands/discord/index.ts

@@ -26,7 +26,7 @@ class DiscordRelay extends Command {
     }
 
     const { stack } = await getStack()
-    const { pubsub } = stack
+    const pubsub = stack.pubsub.create(`chat-${args.room}`)
 
     const client = new Discord.Client({ intents: [Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILDS, Intents.FLAGS.DIRECT_MESSAGES] })
     await client.login(process.env.DISCORD_KEY)

src/services/bootstrap.ts

@@ -0,0 +1,16 @@
+import { request, gql } from 'graphql-request'
+import { URL } from 'node:url'
+
+export const getBootstrapData = async () => {
+  const endpoint = process.env.RELAY_GRAPHQL_ENDPOINT || 'https://relay.dstack.dev:443/graphql'
+  const url = new URL(endpoint)
+
+  const query = gql`
+    query Bootstrap($protocol: Protocol!, $hostname: String!, $port: Int!) {
+      listen(protocol: $protocol, hostname: $hostname, port: $port)
+      peers(randomize: true)
+    }
+  `
+
+  return request<{ listen: string[]; peers: string[] }>(endpoint, query, { protocol: url.protocol.replace(':', ''), hostname: url.hostname, port: Number(url.port || '443') })
+}

src/services/chat.ts

@@ -3,8 +3,9 @@ import { getStack } from './stack'
 
 export const run = async (room: string, nickname?: string) => {
   const { ipfs, stack } = await getStack()
-  const { id, pubsub } = stack
+  const { id } = await stack.id()
 
+  const pubsub = stack.pubsub.create<{ nickname?: string; message: string }>(`chat-${room}`)
   const screen = blessed.screen({
     smartCSR: true,
     title: `#${room}`
@@ -93,7 +94,7 @@ export const run = async (room: string, nickname?: string) => {
     }
 
     try {
-      await pubsub.publish(room, { nickname, message })
+      await pubsub.publish('message', { nickname, message })
     } catch {
       // error handling
     } finally {
@@ -114,14 +115,14 @@ export const run = async (room: string, nickname?: string) => {
   screen.append(input)
   input.focus()
 
-  await pubsub.subscribe(room, event => {
+  await pubsub.subscribe('message', 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()
   })
 
   setInterval(async () => {
-    messageList.setLabel(` Messages #${room} - Peers: ${await pubsub.peers(room)} `)
+    messageList.setLabel(` Messages #${room} - Peers: ${await pubsub.peers('message')} `)
     screen.render()
   }, 1000)
 

src/services/stack.ts

@@ -1,14 +1,17 @@
 import { create } from '@dstack-js/ipfs'
 import { Stack } from '@dstack-js/lib'
+// @ts-expect-error: no types
+import WebRTCStar from 'libp2p-webrtc-star'
+// @ts-expect-error: no types
+import WebSocket from 'libp2p-websockets'
+import { getBootstrapData } from './bootstrap'
 
 const wrtc = require('wrtc')
 
-interface Message {
-  nickname?: string;
-  message: string;
-}
-
 export const getStack = async () => {
+  const bootstrap = await getBootstrapData()
+  console.log(bootstrap)
+
   const ipfs = await create({
     repo: process.env.IPFS_REPO,
     init: {
@@ -22,7 +25,7 @@ export const getStack = async () => {
     },
     config: {
       Addresses: {
-        Swarm: ['/ip4/0.0.0.0/tcp/0', '/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star']
+        Swarm: bootstrap.listen
       },
       Discovery: {
         MDNS: {
@@ -33,11 +36,20 @@ export const getStack = async () => {
           Enabled: true
         }
       },
-      Bootstrap: ['/dns4/dstack-relay.herokuapp.com/tcp/443/wss/p2p-webrtc-star/p2p/QmV2uXBKbii29iJKHKVy8sx5m49qdDTBYNybVoa5uLJtrf']
+      Bootstrap: bootstrap.peers
+    },
+    libp2p: {
+      // @ts-expect-error: incompatible types
+      modules: {
+        transport: [WebRTCStar, WebSocket]
+      },
+      addresses: {
+        listen: bootstrap.listen
+      }
     }
   }, wrtc)
 
-  const stack = await Stack.create('dstack-chat', ipfs)
+  const stack = await Stack.create('dstack', ipfs)
 
-  return { stack: stack as Stack<Message>, ipfs }
+  return { stack, ipfs }
 }