Handling options

Signed-off-by: Rob Moffat <[email protected]>
finos · Jul 1, 2023 · c70bf6e · c70bf6e
1 parent 1bfbe91
commit c70bf6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/lib/loaders/load-with-import.ts b/src/lib/loaders/load-with-import.ts
@@ -4,10 +4,10 @@ import { APIResponseMessage, FDC3Initialiser } from "../types";
 /**
  * This loads the script using an import
  */
-export function load(resolve: (da: DesktopAgent) => void, data: APIResponseMessage) {
-    import(data.url).then(ns => {
+export function load(data: APIResponseMessage) : Promise<DesktopAgent> {
+    return import(/* @vite-ignore */ data.url).then(ns => {
         const init = ns.default as FDC3Initialiser;
         const da = init(data.appIdentifier);
-        resolve(da);
+        return da;
     })
 }
diff --git a/src/lib/strategies/post-message.ts b/src/lib/strategies/post-message.ts
@@ -1,5 +1,5 @@
 import { AppIdentifier, DesktopAgent} from '@finos/fdc3'
-import { APIResponseMessage, AppIdentifierResolver, Strategy } from '../types'
+import { APIResponseMessage, AppIdentifierResolver, Options, Strategy } from '../types'
 import { load } from '../loaders/load-with-import';
 
 const FDC3_API_REQUEST_MESSAGE_TYPE = 'FDC3-API-Request';
@@ -36,14 +36,24 @@ export const strategy : Strategy = {
         });
     },
 
-    load : (options: any) => {
+    load : (options: Options) => {
+
+        function handleOptions(da: DesktopAgent) {
+            if ((options.setWindowGlobal) && (window.fdc3 == null)) {
+                window.fdc3 = da;
+            }
+
+            return da;
+        }
 
         const out = new Promise<DesktopAgent>((resolve, reject) => {
             // setup listener for message and retrieve JS URL from it
             window.addEventListener("message", (event) => {
                 const data : APIResponseMessage = event.data ;
                 if (data.type == FDC3_API_RESPONSE_MESSAGE_TYPE) {
-                    load(resolve, data);
+                    load(data)
+                        .then(da => handleOptions(da))
+                        .then(da => resolve(da))
                 } else {
                     reject("Incorrect API Response Message");
                 }