Merge pull request #356 from rikoe/release/1.1

fix: add reject/throw if fdc3 is not available to package

Author: rikoe

.github/workflows/package.yml

@@ -8,13 +8,15 @@ on:
   push:
     branches:
       - master
+      - release/**
     paths-ignore:
       - '.github/workflows/docusaurus.yml'
       - 'docs/**'
       - 'website/**'
   pull_request:
     branches:
       - master
+      - release/*
     paths-ignore:
       - '.github/workflows/docusaurus.yml'
       - 'docs/**'
@@ -26,8 +28,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node: ['10.x', '12.x', '14.x']
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        node: ['14.x']
+        os: [ubuntu-latest, windows-latest]
 
     steps:
       - name: Checkout repo
@@ -48,4 +50,22 @@ jobs:
         run: yarn test --ci --coverage --maxWorkers=2
 
       - name: Build
-        run: yarn build
+        run: yarn build
+
+      - name: Publish to NPM
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          registry: https://registry.npmjs.org/
+          access: public
+          dry-run: true
+          check-version: true
+          token: ${{ secrets.NPM_TOKEN }}
+
+      - name: Publish to GitHub
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          registry: https://npm.pkg.github.com
+          access: public
+          dry-run: true
+          check-version: true
+          token: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/fdc3",
-  "version": "1.1.0-alpha.2",
+  "version": "1.1.0-alpha.3",
   "author": "Fintech Open Source Foundation (FINOS)",
   "homepage": "https://fdc3.finos.org",
   "repository": {

src/api/methods.ts

@@ -7,70 +7,85 @@ import {
   Listener,
 } from '..';
 
+const unavailableError = new Error(
+  'FDC3 DesktopAgent not available at `window.fdc3`.'
+);
+
+const rejectIfNoGlobal = (f: () => Promise<any>) => {
+  return window.fdc3 ? f() : Promise.reject(unavailableError);
+};
+
+const throwIfNoGlobal = (f: () => any) => {
+  if (!window.fdc3) {
+    throw unavailableError;
+  }
+  return f();
+};
+
 export const open: (name: string, context?: Context) => Promise<void> = (
   name,
   context
 ) => {
-  return window.fdc3.open(name, context);
+  return rejectIfNoGlobal(() => window.fdc3.open(name, context));
 };
 
 export const findIntent: (
   intent: string,
   context?: Context
 ) => Promise<AppIntent> = (intent, context) => {
-  return window.fdc3.findIntent(intent, context);
+  return rejectIfNoGlobal(() => window.fdc3.findIntent(intent, context));
 };
 
 export const findIntentsByContext: (
   context: Context
 ) => Promise<Array<AppIntent>> = context => {
-  return window.fdc3.findIntentsByContext(context);
+  return rejectIfNoGlobal(() => window.fdc3.findIntentsByContext(context));
 };
 
 export const broadcast: (context: Context) => void = context => {
-  window.fdc3.broadcast(context);
+  throwIfNoGlobal(() => window.fdc3.broadcast(context));
 };
 
 export const raiseIntent: (
   intent: string,
   context: Context,
   target?: string
 ) => Promise<IntentResolution> = (intent, context, target) => {
-  return window.fdc3.raiseIntent(intent, context, target);
+  return rejectIfNoGlobal(() => window.fdc3.raiseIntent(intent, context, target));
 };
 
 export const addIntentListener: (
   intent: string,
   handler: ContextHandler
 ) => Listener = (intent, handler) => {
-  return window.fdc3.addIntentListener(intent, handler);
+  return throwIfNoGlobal(() => window.fdc3.addIntentListener(intent, handler));
 };
 
 export const addContextListener: (
   contextTypeOrHandler: string | ContextHandler,
   handler?: ContextHandler
 ) => Listener = (a, b) => {
   if (typeof a !== 'function') {
-    return window.fdc3.addContextListener(a as string, b as ContextHandler);
+    return throwIfNoGlobal(() =>
+      window.fdc3.addContextListener(a as string, b as ContextHandler)
+    );
   } else {
-    return window.fdc3.addContextListener(a as ContextHandler);
+    return throwIfNoGlobal(() =>
+      window.fdc3.addContextListener(a as ContextHandler)
+    );
   }
 };
 
 export const getSystemChannels: () => Promise<Array<Channel>> = () => {
-  return window.fdc3.getSystemChannels();
+  return rejectIfNoGlobal(() => window.fdc3.getSystemChannels());
 };
 
 export const joinChannel: (channelId: string) => Promise<void> = channelId => {
-  return window.fdc3.joinChannel(channelId);
+  return rejectIfNoGlobal(() => window.fdc3.joinChannel(channelId));
 };
 
 export const getOrCreateChannel: (
   channelId: string
 ) => Promise<Channel> = channelId => {
-  return window.fdc3.getOrCreateChannel(channelId);
-};
-
-export const getCurrentChannel: () => Promise<Channel> = () => {
-  return window.fdc3.getCurrentChannel();
-};
+  return rejectIfNoGlobal(() => window.fdc3.getOrCreateChannel(channelId));
+};