fix(relay, ipfs): add fallback wrtc, get peers list with original multiaddr

Author: 0x77dev

package.json

@@ -88,7 +88,7 @@
     "prepare": "npm-run-all prepare:hooks",
     "prepare:hooks": "husky install",
     "release": "standard-version --bumpFiles package.json packages/lib/package.json packages/ipfs/package.json packages/relay/package.json packages/transport/package.json && scripts/publish",
-    "serve": "nx run-many --all --target=serve"
+    "serve": "nx run-many --all --verbose --target=serve"
   },
   "version": "0.2.48",
   "workspaces": [

packages/ipfs/src/bootstrap.ts

@@ -9,19 +9,13 @@ export const bootstrap = async (
   const query = gql`
     query Bootstrap($protocol: Protocol!, $hostname: String!, $port: Int!) {
       listen(protocol: $protocol, hostname: $hostname, port: $port)
-      peers(
-        randomize: true
-        protocol: $protocol
-        hostname: $hostname
-        port: $port
-      )
+      peers(randomize: true)
     }
   `
 
   const { listen, peers } = await request<{
     listen: string[];
     peers: string[];
-    namespace: string;
   }>(
     relay,
     query,

packages/relay/package.json

@@ -16,7 +16,8 @@
     "nexus": "1.3.0",
     "prom-client": "14.0.1",
     "redis": "4.0.4",
-    "socket.io": "4.4.1"
+    "socket.io": "4.4.1",
+    "wrtc": "^0.4.7"
   },
   "devDependencies": {
     "@types/lru-cache": "^7.6.0",

packages/relay/src/services/stack.ts

@@ -1,10 +1,9 @@
 import { join } from 'path'
 import { Stack, Storage } from '@dstack-js/lib'
-// @ts-expect-error: no-types
-import wrtc from '@dstack-js/wrtc'
 import LRUCache from 'lru-cache'
 import { tmpdir } from 'os'
 import { redis } from './cache'
+import { getWRTC } from './wrtc'
 
 export class RedisStorage<T = { value: string; date: Date }>
 implements Storage<T> {
@@ -62,8 +61,10 @@ export const getStack = async (namespace: string) => {
       cache.set(namespace, 'allocating')
       stack = await Stack.create({
         namespace,
-        wrtc,
-        relay: `http://127.0.0.1:${process.env['PORT'] || 13579}/graphql`,
+        wrtc: getWRTC(),
+        relay:
+          process.env['RELAY_URL'] ||
+          `http://127.0.0.1:${process.env['PORT'] || 13579}/graphql`,
         repo: join(tmpdir(), '.dstack', namespace),
         storage: new RedisStorage(namespace)
       })
@@ -78,7 +79,8 @@ export const getStack = async (namespace: string) => {
         namespace,
         error
       )
-      throw error
+
+      return null
     }
   }
 

packages/relay/src/services/wrtc.ts

@@ -0,0 +1,7 @@
+export const getWRTC = () => {
+  try {
+    return require('wrtc')
+  } catch (error) {
+    return require('@dstack-js/wrtc')
+  }
+}

scripts/deploy

@@ -1,5 +1,4 @@
 #!/bin/bash
-yarn build
+yarn nx build relay
 cd dist/packages/relay
-heroku container:push web -a dstack-relay
-heroku container:release web -a dstack-relay
+fly deploy --remote-only

yarn.lock

@@ -2785,6 +2785,7 @@ __metadata:
     socket.io: 4.4.1
     ts-node: 10.7.0
     tsconfig-paths: 3.14.1
+    wrtc: ^0.4.7
   bin:
     dstack-relay: src/index.js
   languageName: unknown
@@ -28279,6 +28280,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrtc@npm:^0.4.7":
+  version: 0.4.7
+  resolution: "wrtc@npm:0.4.7"
+  dependencies:
+    domexception: ^1.0.1
+    node-pre-gyp: ^0.13.0
+  dependenciesMeta:
+    domexception:
+      optional: true
+  checksum: 2a2ce03ee15e8ee1737a9b8d0937ededc135f06c8e58bb8c3c0d7028e29ef0b75708616d2ce2a1792c08fab24b2f4c51a8f0d52fe3b296d5d7ac31a8d6eeab5c
+  languageName: node
+  linkType: hard
+
 "ws@npm:^7.3.1, ws@npm:^7.4.6":
   version: 7.5.7
   resolution: "ws@npm:7.5.7"