Messages passing via socket from app to da

README.md

@@ -42,7 +42,9 @@ The project is divided into several different yarn workspaces:
 
  - `common` : Common APIs and functionality used by both `client` and `server`
 
- - `demo` : A bare-bones desktop agent implementation with a few apps that use WebFDC3
+ - `fdc3-web-demo` : A bare-bones desktop agent implementation with a few apps that use WebFDC3.  See: https://static.swimlanes.io/6bb69f2c9acdc0656f5f3b098d40518e.png for how this works.  Basically, the implementation here is that it uses iframes approach and a server-side websocket to relay messages.
+
+ - `fdc3-workbench`: The FDC3 Workbench app from https://github.com/FDC3/toolbox/workbench, ported to use WebFDC3. 
  
  
 ## Configuring the client

packages/client/src/messaging/message-port.ts

@@ -19,6 +19,7 @@ export async function messagePortInit(mp: MessagePort, data: APIResponseMessage)
     const is = new DefaultIntentSupport(messaging, new DesktopAgentIntentResolver(messaging))
     const as = new DefaultAppSupport(messaging, data.appIdentifier, "WebFDC3")
     const da = new BasicDesktopAgent(hs, cs, is, as, version)
+    await da.connect()
     return da
 }
 

packages/da-server/src/supply/post-message.ts

@@ -6,18 +6,18 @@ import { APIResponseMessage, AppChecker, DesktopAgentDetailResolver, Supplier, F
  * Called by the server-side desktop agent.
  */
 export const supply: Supplier = (
-    checker: AppChecker, 
-    detailsResolver: DesktopAgentDetailResolver, 
+    checker: AppChecker,
+    detailsResolver: DesktopAgentDetailResolver,
     portResolver: DesktopAgentPortResolver = () => null) => {
-    
+
     function createResponseMessage(source: Window, appId: AppIdentifier): APIResponseMessage {
         return {
-            provider: "string",
-            authRequired: true,
-            authToken: "secret",
-            desktopAgentBridgeVersion: "demo",
-            supportedFDC3Versions: [ '2.0'],
-            fdc3Version: "2.0",
+            //provider: "string",
+            //authRequired: true,
+            //authToken: "secret",
+            //desktopAgentBridgeVersion: "demo",
+            //supportedFDC3Versions: [ '2.0'],
+            //fdc3Version: "2.0",
             type: FDC3_API_RESPONSE_MESSAGE_TYPE,
             ...detailsResolver(source, appId),
 
@@ -34,7 +34,7 @@ export const supply: Supplier = (
     function createTransferrableArray(source: Window, appId: AppIdentifier): Transferable[] {
         const port = portResolver(source, appId);
         if (port) {
-            return [ port ]
+            return [port]
         } else {
             return []
         }
@@ -51,7 +51,7 @@ export const supply: Supplier = (
                 const appDetails = checker(source)
                 if (appDetails) {
                     console.log(`API Request Origin:  ${origin}`);
-                    const message = createResponseMessage(source,appDetails)
+                    const message = createResponseMessage(source, appDetails)
                     const transferrables = createTransferrableArray(source, appDetails)
                     source.postMessage(message, {
                         targetOrigin: origin,

packages/fdc3-common/src/index.ts

@@ -17,17 +17,17 @@ export { exchange, exchangePostMessage, exchangeForMessagePort }
 export type AppChecker = (o: Window) => AppIdentifier | undefined;
 
 export type Supplier = (
-    checker: AppChecker, 
-    detailsResolver: DesktopAgentDetailResolver, 
+    checker: AppChecker,
+    detailsResolver: DesktopAgentDetailResolver,
     portResolver?: DesktopAgentPortResolver) => void;
 
-export type Loader = (options: Options) => Promise<DesktopAgent> 
+export type Loader = (options: Options) => Promise<DesktopAgent>
 
 /**
  * These are details such as login information sent from the desktop back to the 
  * app in order to initialise the api.
  */
-export type DesktopAgentDetails = { [key: string] : string | number | boolean }
+export type DesktopAgentDetails = { [key: string]: string | number | boolean }
 
 /**
  * Use these to return details specific to the window/app needing a connection
@@ -49,16 +49,16 @@ export type APIResponseMessage = {
     method: "message-port",
     uri?: string,           /* Supplied when an embedded iframe should be loaded */
     appIdentifier: AppIdentifier,
-    fdc3Version: string,
-    supportedFDC3Versions: string[],
-    desktopAgentBridgeVersion: string,
-    authRequired: boolean,
-    provider: string,
-    authToken?: string,
+    // fdc3Version: string,
+    // supportedFDC3Versions: string[],
+    // desktopAgentBridgeVersion: string,
+    // authRequired: boolean,
+    // provider: string,
+    // authToken?: string,
 }
 
 export type APIRequestMessage = {
-    type: string, 
+    type: string,
     methods: string[]
 }
 

packages/fdc3-web-demo/package.json

@@ -14,9 +14,19 @@
     "vite": "^5.0.2"
   },
   "dependencies": {
+    "@finos/fdc3": "^2.1.0-beta.4",
+    "@types/uuid": "^9.0.8",
+    "@types/ws": "^8.5.10",
+    "client": "workspace:*",
+    "da-proxy": "workspace:*",
+    "da-server": "workspace:*",
     "express": "^4.18.3",
+    "fdc3-common": "workspace:*",
+    "socket.io": "^4.7.5",
+    "socket.io-client": "^4.7.5",
     "tsx": "^4.5.0",
     "typescript": "^5.3.2",
+    "uuid": "^9.0.1",
     "vite-express": "^0.15.0"
   }
 }