Changed Env to SAIL_DIRECTORY_URL

README.md

@@ -82,7 +82,16 @@ The local appD will run at `localhost:8080` by default.
 
 By default, the Desktop Agent points to the local directory in development and to the `https://appd.kolbito.com` directory in production.  You can change the local settings in `scripts/watch.js` by modifying the entries for `VITE_DEV_DIRECTORY_URL` and change the production setting by modifying the value for `productionDirectory` in `packages/main/src/utils.ts`.
 
-## Getting Started
+## Getting Started (Using the FINOS App Directory)
+
+~~~
+npm install
+npm start
+~~~
+
+This will use the FINOS app directory at https://directory.fdc3.finos.org/v2/apps
+
+## Getting Started With Your Own App Directory
 
 Install dependencies:
 
@@ -99,6 +108,12 @@ npm run start:directory
 
 This will run a local App Directory on port 8080.
 
+Set the environment variable to use this directory: 
+
+~~~
+export SAIL_DIRECTORY_URL=https://localhost:8080
+~~~
+
 Start the FDC3 application:
 
 ~~~

packages/main/src/directory/directory.ts

@@ -68,4 +68,10 @@ export class Directory {
   retrieveByName(name: string): DirectoryApp[] {
     return this.retrieve((app) => app.name == name);
   }
+
+  retrieveByQuery(query: string): DirectoryApp[] {
+    // tbd
+    console.log('Directory Query: ' + query);
+    return this.apps;
+  }
 }

packages/main/src/directory/fdc3-2_0-loaders.ts

@@ -1,5 +1,6 @@
 import { readFile } from 'fs/promises';
 import { DirectoryApp } from './directory';
+import fetch from 'electron-fetch';
 
 const convertToDirectoryList = (data: unknown) => data as DirectoryApp[];
 const convertSingleApp = (data: unknown) => [data] as DirectoryApp[];
@@ -10,7 +11,6 @@ const convertSingleApp = (data: unknown) => [data] as DirectoryApp[];
  */
 export function fdc3AppDirectoryLoader(u: string): Promise<DirectoryApp[]> {
   let converter;
-  console.log('IN: ' + process.cwd());
 
   if (u.endsWith('/v2/apps') || u.endsWith('/v2/apps/')) {
     // whole directory

packages/main/src/handlers/runtime/fetch.ts → packages/main/src/handlers/runtime/directory-fetch.ts

@@ -1,19 +1,16 @@
 import { getRuntime } from '../../index';
 import { RuntimeMessage } from '../runtimeMessage';
 import { WebContents } from 'electron';
-import utils from '../../utils';
-import fetch from 'electron-fetch';
 import { RUNTIME_TOPICS } from './topics';
 import { Runtime } from '/@/runtime';
 
 export function initFetchFromDirectory(
   runtime: Runtime = getRuntime(),
 ): (message: RuntimeMessage) => Promise<void> {
   return async (message: RuntimeMessage) => {
-    const directoryUrl = await utils.getDirectoryUrl();
+    const directory = runtime.getDirectory();
 
-    const response = await fetch(`${directoryUrl}${message.data.query}`);
-    const result = await response.json();
+    const result = directory.retrieveByQuery(message.data.query);
 
     //request can come frome 2 types of (priviledged) sources: the workspace UI and views
     //if the sourceType is View.  We need to check that the view is a 'system' view and can access the directory

packages/main/src/handlers/runtime/index.ts

@@ -13,7 +13,7 @@ import { openToolsMenu } from './toolbar';
 import { pickChannel, joinChannel } from './channelPicker';
 import { loadSearchResults } from './search';
 import { resolveIntent } from '../fdc3/resolveIntent';
-import { initFetchFromDirectory } from './directory';
+import { initFetchFromDirectory } from './directory-fetch';
 
 export const register = (runtime: Runtime) => {
   runtime.addHandler(RUNTIME_TOPICS.TAB_SELECTED, tabSelected);

packages/main/src/utils.ts

@@ -5,22 +5,16 @@
 import { channels } from './system-channels';
 import { ChannelData } from './types/FDC3Data';
 import { FDC3EventDetail } from './types/FDC3Event';
-import { DirectoryPort } from '../../../directory/src/config';
 
-const productionDirectory = 'https://appd.kolbito.com';
+const DEFAULT_DIRECTORY = 'https://directory.fdc3.finos.org/v2/apps';
 
 const getDirectoryUrl = (): Promise<string> => {
-  return new Promise((resolve) => {
-    const url: string =
-      import.meta.env.DEV && import.meta.env.VITE_DEV_DIRECTORY_URL
-        ? `${import.meta.env.VITE_DEV_DIRECTORY_URL}`
-        : productionDirectory;
-
-    if (url === 'local') {
-      resolve(`http://localhost:${DirectoryPort}`);
-    } else {
-      resolve(url);
-    }
+  return new Promise(() => {
+    const url: string = import.meta.env.SAIL_DIRECTORY_URL
+      ? `${import.meta.env.SAIL_DIRECTORY_URL}`
+      : DEFAULT_DIRECTORY;
+
+    return url;
   });
 };
 

scripts/watch.js

@@ -56,9 +56,6 @@ const setupMainPackageWatcher = ({ config: { server } }) => {
     process.env.VITE_DEV_SERVER_CHANNEL_URL = `${protocol}//${host}:${port}${path}channelPicker.html`;
     process.env.VITE_DEV_SERVER_SEARCH_URL = `${protocol}//${host}:${port}${path}searchResults.html`;
     process.env.VITE_DEV_SERVER_INTENTS_URL = `${protocol}//${host}:${port}${path}intentResolver.html`;
-
-    //set directory address.  'local' will be resolved to the local directory in the project
-    process.env.VITE_DEV_DIRECTORY_URL = 'local';
   }
 
   const logger = createLogger(LOG_LEVEL, {