Merge pull request #20 from NavAbility/jhr/19/async

Async throughout

Author: jim-hill-r

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "navabilitysdk",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "NavAbility SDK: Access NavAbility Cloud factor graph features from JavaScript. Note that this SDK and the related API are still in development. Please let us know if you have any issues at info@navability.io.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package.json

@@ -2,6 +2,7 @@
 export * from './navability/graphql/QueriesDeprecated';
 export * from './navability/graphql/Variable';
 export * from './navability/graphql/Factor';
+export * from './navability/graphql/Status';
 
 // Entities
 export * from './navability/entities/Blob';
@@ -19,3 +20,5 @@ export * from './navability/services/Solve';
 export * from './navability/services/Example';
 export * from './navability/services/Blob';
 export * from './navability/services/Dataproc';
+export * from './navability/services/Status';
+export * from './navability/services/Utils';

src/index.ts

@@ -0,0 +1,31 @@
+export const GQL_GETSTATUSMESSAGES = `
+query sdk_ls_statusmessages($id: ID!) {
+    statusMessages(id: $id) {
+        requestId,
+        action,
+        state,
+        timestamp,
+        client {
+            userId,
+            robotId,
+            sessionId
+        }
+    }
+}
+`;
+
+export const GQL_GETSTATUSLATEST = `
+query sdk_get_statuslatest($id: ID!) {
+  statusLatest(id: $id) {
+    requestId,
+    action,
+    state,
+    timestamp,
+    client {
+      userId,
+      robotId,
+      sessionId
+    }
+  }
+}
+`;

src/navability/graphql/Status.ts

@@ -4,8 +4,8 @@ import { NavAbilityClient } from '../entities/NavAbilityClient';
 import { CalibrationResult } from '../entities/Dataproc';
 import { MUTATION_PROC_CALIBRATION, QUERY_CALIBRATION } from '../graphql/QueriesDeprecated';
 
-export function procCalibration(navAbilityClient: NavAbilityClient, fileId: string) {
-  navAbilityClient.mutate({
+export async function procCalibration(navAbilityClient: NavAbilityClient, fileId: string): Promise<void> {
+  await navAbilityClient.mutate({
     mutation: gql(MUTATION_PROC_CALIBRATION),
     variables: {
       fileId,

src/navability/services/Dataproc.ts

@@ -4,8 +4,8 @@ import { NavAbilityClient } from '../entities/NavAbilityClient';
 import { Client } from '../entities/Client';
 import { MUTATION_DEMOCANONICALHEXAGONAL } from '../graphql/QueriesDeprecated';
 
-export function demoCanonicalHexagonal(navAbilityClient: NavAbilityClient, client: Client) {
-  navAbilityClient.mutate({
+export async function demoCanonicalHexagonal(navAbilityClient: NavAbilityClient, client: Client) {
+  await navAbilityClient.mutate({
     mutation: gql(MUTATION_DEMOCANONICALHEXAGONAL),
     variables: {
       client,

src/navability/services/Example.ts

@@ -4,17 +4,17 @@ import { NavAbilityClient } from '../entities/NavAbilityClient';
 import { Client, Scope } from '../entities/Client';
 import { MUTATION_SOLVESESSION, MUTATION_SOLVEFEDERATED } from '../graphql/QueriesDeprecated';
 
-export function solveSession(navAbilityClient: NavAbilityClient, client: Client) {
-  navAbilityClient.mutate({
+export async function solveSession(navAbilityClient: NavAbilityClient, client: Client) {
+  await navAbilityClient.mutate({
     mutation: gql(MUTATION_SOLVESESSION),
     variables: {
       client,
     },
   });
 }
 
-export function solveFederated(navAbilityClient: NavAbilityClient, scope: Scope) {
-  navAbilityClient.mutate({
+export async function solveFederated(navAbilityClient: NavAbilityClient, scope: Scope) {
+  await navAbilityClient.mutate({
     mutation: gql(MUTATION_SOLVEFEDERATED),
     variables: {
       scope,

src/navability/services/Solve.ts

@@ -0,0 +1,35 @@
+import { gql } from '@apollo/client';
+import { NavAbilityClient, GQL_GETSTATUSLATEST, GQL_GETSTATUSMESSAGES } from '../..';
+
+export async function getStatusMessages(navAbilityClient: NavAbilityClient, id: string) {
+  const response = await navAbilityClient.query({
+    query: gql(GQL_GETSTATUSMESSAGES),
+    variables: {
+      id,
+    },
+  });
+  if (response.data.errors) {
+    throw Error(`Error: ${response.Data.errors[0]}`);
+  } else {
+    return response.data?.statusMessages || [];
+  }
+}
+
+export async function getStatusLatest(navAbilityClient: NavAbilityClient, id: string) {
+  const response = await navAbilityClient.query({
+    query: gql(GQL_GETSTATUSLATEST),
+    variables: {
+      id,
+    },
+  });
+  if (response.data.errors) {
+    throw Error(`Error: ${response.Data.errors[0]}`);
+  } else {
+    return response.data?.statusLatest || [];
+  }
+}
+
+export async function getStatusesLatest(navAbilityClient: NavAbilityClient, ids: string[]) {
+  const statusPromises = ids.map((id) => getStatusLatest(navAbilityClient, id));
+  return await Promise.all(statusPromises);
+}

src/navability/services/Status.ts

@@ -0,0 +1,29 @@
+import { NavAbilityClient, getStatusesLatest } from '../..';
+
+export function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export async function waitForCompletion(
+  navAbilityClient: NavAbilityClient,
+  requestIds: string[],
+  maxSeconds: number = 60,
+  expectedStatuses: string[] = ['Complete', 'Failed'],
+  exceptionMessage: string = 'Requests did not complete in time',
+) {
+  let waitTime = maxSeconds;
+  let tasksComplete = false;
+  while (!tasksComplete) {
+    const statuses = await getStatusesLatest(navAbilityClient, requestIds);
+    tasksComplete = statuses.every((s: any) => expectedStatuses.includes(s.state));
+    if (tasksComplete) {
+      break;
+    } else {
+      await sleep(2000);
+      waitTime -= 2;
+      if (waitTime <= 0) {
+        throw Error(exceptionMessage);
+      }
+    }
+  }
+}