feat(chat): refactor and bump dstack

Author: 0x77dev

.eslintrc

@@ -8,6 +8,7 @@
   "rules": {
     "node/no-missing-import": "off",
     "unicorn/no-process-exit": "off",
-    "no-process-exit": "off"
+    "no-process-exit": "off",
+    "space-before-function-paren": "off"
   }
-}
+}

package.json

@@ -10,7 +10,7 @@
   "bugs": "https://github.com/dstack-js/chat/issues",
   "dependencies": {
     "@dstack-js/ipfs": "^0.2.22",
-    "@dstack-js/lib": "^0.2.23",
+    "@dstack-js/lib": "^0.2.25",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "blessed": "^0.1.81",

src/commands/discord/index.ts

@@ -25,7 +25,9 @@ class DiscordRelay extends Command {
       throw new Error('DISCORD_KEY env is missing')
     }
 
-    const { pubsub } = await getStack()
+    const { stack } = await getStack()
+    const { pubsub } = stack
+
     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/chat.ts

@@ -2,7 +2,8 @@ import * as blessed from 'blessed'
 import { getStack } from './stack'
 
 export const run = async (room: string, nickname?: string) => {
-  const { ipfs, stack, pubsub } = await getStack()
+  const { ipfs, stack } = await getStack()
+  const { id, pubsub } = stack
 
   const screen = blessed.screen({
     smartCSR: true,
@@ -20,7 +21,7 @@ export const run = async (room: string, nickname?: string) => {
     left: 0,
     items: [
       'dstack: connected',
-      `dstack: your id is ${stack.id.slice(-5)}`,
+      `dstack: your id is ${id.slice(-5)}`,
       'dstack: use /help to see commands'
     ]
   })
@@ -31,7 +32,7 @@ export const run = async (room: string, nickname?: string) => {
     height: '10%',
     inputOnFocus: true,
     clickable: true,
-    label: ` ID: ${stack.id.slice(-5)} `,
+    label: ` ID: ${id.slice(-5)} `,
     padding: {
       top: 1,
       left: 2
@@ -101,8 +102,12 @@ export const run = async (room: string, nickname?: string) => {
     }
   })
 
-  screen.key(['escape', 'q', 'C-c'], function () {
-    return process.exit(0)
+  screen.key(['escape', 'q', 'C-c'], () => {
+    process.exit(0)
+  })
+
+  input.key(['C-c'], () => {
+    process.exit(0)
   })
 
   screen.append(messageList)

src/services/stack.ts

@@ -1,6 +1,6 @@
 import { create } from '@dstack-js/ipfs'
 import { Stack } from '@dstack-js/lib'
-import type { PubSub } from '@dstack-js/lib/src/pubsub'
+
 const wrtc = require('wrtc')
 
 interface Message {
@@ -38,7 +38,6 @@ export const getStack = async () => {
   }, wrtc)
 
   const stack = await Stack.create('dstack-chat', ipfs)
-  const pubsub = stack.pubsub as PubSub<Message>
 
-  return { pubsub, stack, ipfs }
+  return { stack: stack as Stack<Message>, ipfs }
 }

yarn.lock

@@ -252,10 +252,10 @@
     libp2p-webrtc-star "^0.25.0"
     tslib "^2.3.1"
 
-"@dstack-js/lib@^0.2.23":
-  version "0.2.23"
-  resolved "https://registry.yarnpkg.com/@dstack-js/lib/-/lib-0.2.23.tgz#3b41188edc7a74210ad51af2787aec53b68da602"
-  integrity sha512-+Vocbvhmh7GU+WR9MnSvUD2Kr0e0pX90DmKqEq1oSXMnp8TiblQfBaTBVyBVf66ygWyKGwi9VGQzLA5BBqLAbQ==
+"@dstack-js/lib@^0.2.25":
+  version "0.2.25"
+  resolved "https://registry.yarnpkg.com/@dstack-js/lib/-/lib-0.2.25.tgz#9e0d53e96fe1e81d450678c04d21bea19bbb67d1"
+  integrity sha512-FPdAG8+nl5PENpUR3sUQv79WCTC37atCOIK3kvPFxql2AhkCvAUYqoGMYdZuvGr44P+PSSL2MPwftZZYEml0AQ==
   dependencies:
     buffer "^6.0.3"
     it-drain "^1.0.5"