CF SDK: Make dial and reattach a sync function

.changeset/dry-horses-raise.md

@@ -0,0 +1,5 @@
+---
+'@signalwire/js': patch
+---
+
+CF SDK: Make `dial` and `reattach` a sync function

internal/e2e-js/tests/buildVideoWithFabricSDK.spec.ts

@@ -2,6 +2,7 @@ import {
   OverlayMap,
   LocalVideoOverlay,
   FabricRoomSession,
+  SignalWireClient,
 } from '@signalwire/js'
 import { test, expect, Page } from '../fixtures'
 import {
@@ -269,9 +270,9 @@ test.describe('buildVideoElement with CallFabric SDK', () => {
       async ({ roomName }) => {
         return new Promise<any>(async (resolve, _reject) => {
           // @ts-expect-error
-          const client = window._client
+          const client: SignalWireClient = window._client
 
-          const call = await client.dial({
+          const call = client.dial({
             to: `/public/${roomName}?channel=video`,
             rootElement: document.getElementById('rootElement'),
           })

internal/e2e-js/tests/callfabric/reattach.spec.ts

@@ -38,7 +38,7 @@ test.describe('Reattach Tests', () => {
           // @ts-expect-error
           const client: SignalWireClient = window._client
 
-          const call = await client.reattach({
+          const call = client.reattach({
             to: `/public/${roomName}?channel=video`,
             rootElement: document.getElementById('rootElement'),
           })
@@ -75,9 +75,9 @@ test.describe('Reattach Tests', () => {
       async ({ roomName }) => {
         return new Promise<any>(async (resolve, _reject) => {
           // @ts-expect-error
-          const client = window._client
+          const client: SignalWireClient = window._client
 
-          const call = await client.dial({
+          const call = client.dial({
             to: `/public/${roomName}?channel=video`,
             rootElement: document.getElementById('rootElement'),
           })
@@ -148,9 +148,9 @@ test.describe('Reattach Tests', () => {
       async ({ roomName }) => {
         return new Promise<any>(async (resolve, _reject) => {
           // @ts-expect-error
-          const client = window._client
+          const client: SignalWireClient = window._client
 
-          const call = await client.reattach({
+          const call = client.reattach({
             to: `/public/${roomName}?channel=video`,
             rootElement: document.getElementById('rootElement'),
           })

internal/e2e-js/tests/callfabric/videoRoom.spec.ts

@@ -1,5 +1,9 @@
 import { uuid } from '@signalwire/core'
-import { FabricRoomSession, CallJoinedEventParams } from '@signalwire/js'
+import {
+  FabricRoomSession,
+  CallJoinedEventParams,
+  SignalWireClient,
+} from '@signalwire/js'
 import { test, expect } from '../../fixtures'
 import {
   SERVER_URL,
@@ -377,9 +381,9 @@ test.describe('CallFabric VideoRoom', () => {
     const roomSession = await page.evaluate(async () => {
       try {
         // @ts-expect-error
-        const client = window._client
+        const client: SignalWireClient = window._client
 
-        const call = await client.dial({
+        const call = client.dial({
           to: `/public/invalid-address?channel=video`,
           rootElement: document.getElementById('rootElement'),
         })

internal/e2e-js/tests/callfabric/websocket_reconnect.spec.ts

@@ -1,3 +1,4 @@
+import { SignalWireClient } from '@signalwire/js'
 import { test } from '../../fixtures'
 import { SERVER_URL, createCFClient, expectMCUVisible } from '../../utils'
 
@@ -19,9 +20,9 @@ test.describe('CallFabric Reconnections', () => {
       async ({ roomName }) => {
         return new Promise<any>(async (resolve, _reject) => {
           // @ts-expect-error
-          const client = window._client
+          const client: SignalWireClient = window._client
 
-          const call = await client.dial({
+          const call = client.dial({
             to: `/public/${roomName}`,
             rootElement: document.getElementById('rootElement'),
           })
@@ -186,9 +187,9 @@ test.describe('CallFabric Reconnections', () => {
       async ({ roomName }) => {
         return new Promise<any>(async (resolve, _reject) => {
           // @ts-expect-error
-          const client = window._client
+          const client: SignalWireClient = window._client
 
-          const call = await client.dial({
+          const call = client.dial({
             to: `/public/${roomName}`,
             rootElement: document.getElementById('rootElement'),
           })
@@ -333,5 +334,4 @@ test.describe('CallFabric Reconnections', () => {
       ],
     })
   })
-
 })

internal/playground-js/src/fabric/index.js

@@ -883,7 +883,7 @@ window.ready(async function () {
   const room = urlParams.get('room')
   if (room) {
     await connect()
-    await dial({ reattach: true })
+    dial({ reattach: true })
   } else {
     console.log('Room parameter not found')
   }

packages/js/src/fabric/WSClient.ts

@@ -12,7 +12,6 @@ import { buildVideoElement } from '../buildVideoElement'
 import {
   CallParams,
   DialParams,
-  FabricRoomSession,
   IncomingInvite,
   OnlineParams,
   HandlePushNotificationParams,
@@ -299,28 +298,12 @@ export class WSClient extends BaseClient<{}> implements WSClientContract {
     })
   }
 
-  public async dial(params: DialParams) {
-    return new Promise<FabricRoomSession>(async (resolve, reject) => {
-      try {
-        const call = this.buildOutboundCall(params)
-        resolve(call)
-      } catch (error) {
-        this.logger.error('Unable to connect and dial a call', error)
-        reject(error)
-      }
-    })
+  public dial(params: DialParams) {
+    return this.buildOutboundCall(params)
   }
 
-  public async reattach(params: DialParams) {
-    return new Promise<FabricRoomSession>(async (resolve, reject) => {
-      try {
-        const call = this.buildOutboundCall({ ...params, attach: true })
-        resolve(call)
-      } catch (error) {
-        this.logger.error('Unable to connect and reattach a call', error)
-        reject(error)
-      }
-    })
+  public reattach(params: DialParams) {
+    return this.buildOutboundCall({ ...params, attach: true })
   }
 
   public handlePushNotification(params: HandlePushNotificationParams) {

packages/js/src/fabric/interfaces/wsClient.ts

@@ -11,16 +11,16 @@ export interface WSClientContract {
    * Dial a resource and connect the call
    *
    * @param params {@link DialParams}
-   * @returns A promise resolving to the session object {@link FabricRoomSession}.
+   * @returns A session object {@link FabricRoomSession}.
    */
-  dial(params: DialParams): Promise<FabricRoomSession>
+  dial(params: DialParams): FabricRoomSession
   /**
    * Reattach to the previous call if the previous call was not disconnected
    *
    * @param params {@link DialParams}
-   * @returns A promise resolving to the session object {@link FabricRoomSession}.
+   * @returns A session object {@link FabricRoomSession}.
    */
-  reattach(params: DialParams): Promise<FabricRoomSession>
+  reattach(params: DialParams): FabricRoomSession
   /**
    * Handles the incoming call via Push Notification
    *