@dronedeploy/rocos-js-sdk 4.4.10 → 4.4.12

package/cjs/models/gamepad/GamepadConfig.d.ts

@@ -57,12 +57,9 @@ export interface GamepadButtonRef {
     type: GamepadButtonType;
     text: string;
 }
-export interface GamepadAction {
+export interface GamepadActionBase {
     name: string;
     source: GamepadButtonRef;
-    commandId: string;
-    /** Absent on configs saved before Commands V2 existed. */
-    commandVersion?: GamepadCommandVersion;
     triggerType: GamepadTriggerType;
     /** Milliseconds between repeats. Only meaningful for `continuously`. */
     frequency: number;
@@ -76,6 +73,26 @@ export interface GamepadAction {
      */
     modifiers?: GamepadButtonRef[];
 }
+export type GamepadActionType = 'robot' | 'dashboard';
+/** A robot-side action. `actionType` is absent on configurations saved before destinations existed. */
+export interface GamepadRobotAction extends GamepadActionBase {
+    actionType?: 'robot';
+    commandId: string;
+    /** Absent on configs saved before Commands V2 existed. */
+    commandVersion?: GamepadCommandVersion;
+}
+/** A semantic action broadcast to widgets mounted on the current dashboard page. */
+export interface GamepadDashboardAction extends GamepadActionBase {
+    actionType: 'dashboard';
+    actionName: string;
+    /** Custom-widget bundles that predate destinations skip any action without a `commandId`, so it must stay absent. */
+    commandId?: never;
+    commandVersion?: never;
+}
+export type GamepadAction = GamepadRobotAction | GamepadDashboardAction;
+/** Prefer this over checking `actionType === 'robot'`, which misses configurations saved before destinations existed. */
+export declare const isGamepadRobotAction: (action: GamepadAction) => action is GamepadRobotAction;
+export declare const isGamepadDashboardAction: (action: GamepadAction) => action is GamepadDashboardAction;
 export interface GamepadVariable {
     name: string;
     source: GamepadButtonRef;

package/cjs/models/gamepad/GamepadConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GamepadCommandVersion = exports.GamepadTriggerType = exports.MODIFIER_RELEASE_FRACTION = exports.DEFAULT_MODIFIER_THRESHOLD = exports.GamepadButtonType = void 0;
+exports.isGamepadDashboardAction = exports.isGamepadRobotAction = exports.GamepadCommandVersion = exports.GamepadTriggerType = exports.MODIFIER_RELEASE_FRACTION = exports.DEFAULT_MODIFIER_THRESHOLD = exports.GamepadButtonType = void 0;
 // Ref: https://github.com/alaingilbert/GamepadJs
 var GamepadButtonType;
 (function (GamepadButtonType) {
@@ -55,3 +55,12 @@ var GamepadCommandVersion;
     GamepadCommandVersion["COMMANDS_V2"] = "commands-v2";
     GamepadCommandVersion["RUN_JS"] = "run-js";
 })(GamepadCommandVersion || (exports.GamepadCommandVersion = GamepadCommandVersion = {}));
+/** Prefer this over checking `actionType === 'robot'`, which misses configurations saved before destinations existed. */
+const isGamepadRobotAction = (action) => {
+    return action.actionType !== 'dashboard';
+};
+exports.isGamepadRobotAction = isGamepadRobotAction;
+const isGamepadDashboardAction = (action) => {
+    return action.actionType === 'dashboard';
+};
+exports.isGamepadDashboardAction = isGamepadDashboardAction;

package/cjs/services/AuthService.d.ts

@@ -6,6 +6,7 @@ export declare class AuthService extends BaseServiceAbstract implements IBaseSer
     private token?;
     private tokenRefreshTimeoutId?;
     private tokenSubject$;
+    private pendingTokenRequest?;
     constructor(config: IRocosSDKConfig);
     /** Observable for token updates
      *
@@ -54,6 +55,8 @@ export declare class AuthService extends BaseServiceAbstract implements IBaseSer
      * This will return the current token if it is not expired, otherwise it will get a new token based on your config.
      */
     getToken(): Promise<Token>;
+    private getOrRequestToken;
+    private fetchNewToken;
     /**
      * Refresh the authentication token
      *

package/cjs/services/AuthService.js

@@ -50,25 +50,27 @@ class AuthService extends BaseServiceAbstract_1.BaseServiceAbstract {
         if (expiresIn !== undefined) {
             this.logger.warn('setToken(value, expiresIn) is deprecated. Use setToken(value) instead');
         }
-        if (typeof value === 'string') {
-            this.token = new models_1.Token(value);
-        }
-        else {
-            this.token = value;
+        const token = typeof value === 'string' ? new models_1.Token(value) : value;
+        if (token.value !== this.token?.value) {
+            this.pendingTokenRequest = undefined;
         }
+        this.token = token;
         this.config.token = this.token.value;
         // output a message for token change
         if (this.isTokenValid(this.token)) {
             this.tokenSubject$.next(this.token);
         }
         else {
-            void this.getToken();
+            void this.getToken().catch((error) => {
+                this.logger.error('Failed to initialize auth token', error);
+            });
         }
     }
     /**
      * Clear token
      */
     clearToken() {
+        this.pendingTokenRequest = undefined;
         this.token = undefined;
         this.config.token = undefined;
     }
@@ -125,15 +127,38 @@ class AuthService extends BaseServiceAbstract_1.BaseServiceAbstract {
      * This will return the current token if it is not expired, otherwise it will get a new token based on your config.
      */
     async getToken() {
-        if (this.token && this.isTokenValid(this.token)) {
-            if (this.token.isExpiredIn(15, 'minutes')) {
-                this.logger.info('Token expires within 15 minutes. Refreshing.');
-                const newToken = await this.refreshToken();
-                this.setToken(newToken);
-                return newToken;
-            }
+        if (this.token && this.isTokenValid(this.token) && !this.token.isExpiredIn(15, 'minutes')) {
             return this.token;
         }
+        return this.getOrRequestToken(() => this.fetchNewToken());
+    }
+    getOrRequestToken(fetchToken) {
+        if (this.pendingTokenRequest) {
+            return this.pendingTokenRequest;
+        }
+        const request = fetchToken()
+            .then((token) => {
+            if (this.pendingTokenRequest === request) {
+                this.setToken(token);
+            }
+            else if (this.token) {
+                return this.getToken();
+            }
+            return token;
+        })
+            .finally(() => {
+            if (this.pendingTokenRequest === request) {
+                this.pendingTokenRequest = undefined;
+            }
+        });
+        this.pendingTokenRequest = request;
+        return request;
+    }
+    async fetchNewToken() {
+        if (this.token && this.isTokenValid(this.token)) {
+            this.logger.info('Token expires within 15 minutes. Refreshing.');
+            return this.refreshToken();
+        }
         let token;
         try {
             if ('appId' in this.config && 'appKey' in this.config) {
@@ -159,7 +184,6 @@ class AuthService extends BaseServiceAbstract_1.BaseServiceAbstract {
             this.logger.error(message);
             throw new models_1.RocosError(message, models_1.errorCodes.AUTH_ERROR);
         }
-        this.setToken(token);
         return token;
     }
     /**
@@ -192,9 +216,8 @@ class AuthService extends BaseServiceAbstract_1.BaseServiceAbstract {
      */
     async refreshTokenIfExpired(minutes) {
         if (this.token?.isExpiredIn(minutes, 'minutes')) {
-            this.logger.info('Token expires in 15 minutes. Refreshing.');
-            const newToken = await this.refreshToken();
-            this.setToken(newToken);
+            this.logger.info(`Token expires in ${minutes} minutes. Refreshing.`);
+            await this.getOrRequestToken(() => this.refreshToken());
             return true;
         }
         return false;

package/esm/models/gamepad/GamepadConfig.d.ts

@@ -57,12 +57,9 @@ export interface GamepadButtonRef {
     type: GamepadButtonType;
     text: string;
 }
-export interface GamepadAction {
+export interface GamepadActionBase {
     name: string;
     source: GamepadButtonRef;
-    commandId: string;
-    /** Absent on configs saved before Commands V2 existed. */
-    commandVersion?: GamepadCommandVersion;
     triggerType: GamepadTriggerType;
     /** Milliseconds between repeats. Only meaningful for `continuously`. */
     frequency: number;
@@ -76,6 +73,26 @@ export interface GamepadAction {
      */
     modifiers?: GamepadButtonRef[];
 }
+export type GamepadActionType = 'robot' | 'dashboard';
+/** A robot-side action. `actionType` is absent on configurations saved before destinations existed. */
+export interface GamepadRobotAction extends GamepadActionBase {
+    actionType?: 'robot';
+    commandId: string;
+    /** Absent on configs saved before Commands V2 existed. */
+    commandVersion?: GamepadCommandVersion;
+}
+/** A semantic action broadcast to widgets mounted on the current dashboard page. */
+export interface GamepadDashboardAction extends GamepadActionBase {
+    actionType: 'dashboard';
+    actionName: string;
+    /** Custom-widget bundles that predate destinations skip any action without a `commandId`, so it must stay absent. */
+    commandId?: never;
+    commandVersion?: never;
+}
+export type GamepadAction = GamepadRobotAction | GamepadDashboardAction;
+/** Prefer this over checking `actionType === 'robot'`, which misses configurations saved before destinations existed. */
+export declare const isGamepadRobotAction: (action: GamepadAction) => action is GamepadRobotAction;
+export declare const isGamepadDashboardAction: (action: GamepadAction) => action is GamepadDashboardAction;
 export interface GamepadVariable {
     name: string;
     source: GamepadButtonRef;

package/esm/models/gamepad/GamepadConfig.js

@@ -52,3 +52,10 @@ export var GamepadCommandVersion;
     GamepadCommandVersion["COMMANDS_V2"] = "commands-v2";
     GamepadCommandVersion["RUN_JS"] = "run-js";
 })(GamepadCommandVersion || (GamepadCommandVersion = {}));
+/** Prefer this over checking `actionType === 'robot'`, which misses configurations saved before destinations existed. */
+export const isGamepadRobotAction = (action) => {
+    return action.actionType !== 'dashboard';
+};
+export const isGamepadDashboardAction = (action) => {
+    return action.actionType === 'dashboard';
+};

package/esm/services/AuthService.d.ts

@@ -6,6 +6,7 @@ export declare class AuthService extends BaseServiceAbstract implements IBaseSer
     private token?;
     private tokenRefreshTimeoutId?;
     private tokenSubject$;
+    private pendingTokenRequest?;
     constructor(config: IRocosSDKConfig);
     /** Observable for token updates
      *
@@ -54,6 +55,8 @@ export declare class AuthService extends BaseServiceAbstract implements IBaseSer
      * This will return the current token if it is not expired, otherwise it will get a new token based on your config.
      */
     getToken(): Promise<Token>;
+    private getOrRequestToken;
+    private fetchNewToken;
     /**
      * Refresh the authentication token
      *

package/esm/services/AuthService.js

@@ -47,25 +47,27 @@ export class AuthService extends BaseServiceAbstract {
         if (expiresIn !== undefined) {
             this.logger.warn('setToken(value, expiresIn) is deprecated. Use setToken(value) instead');
         }
-        if (typeof value === 'string') {
-            this.token = new Token(value);
-        }
-        else {
-            this.token = value;
+        const token = typeof value === 'string' ? new Token(value) : value;
+        if (token.value !== this.token?.value) {
+            this.pendingTokenRequest = undefined;
         }
+        this.token = token;
         this.config.token = this.token.value;
         // output a message for token change
         if (this.isTokenValid(this.token)) {
             this.tokenSubject$.next(this.token);
         }
         else {
-            void this.getToken();
+            void this.getToken().catch((error) => {
+                this.logger.error('Failed to initialize auth token', error);
+            });
         }
     }
     /**
      * Clear token
      */
     clearToken() {
+        this.pendingTokenRequest = undefined;
         this.token = undefined;
         this.config.token = undefined;
     }
@@ -122,15 +124,38 @@ export class AuthService extends BaseServiceAbstract {
      * This will return the current token if it is not expired, otherwise it will get a new token based on your config.
      */
     async getToken() {
-        if (this.token && this.isTokenValid(this.token)) {
-            if (this.token.isExpiredIn(15, 'minutes')) {
-                this.logger.info('Token expires within 15 minutes. Refreshing.');
-                const newToken = await this.refreshToken();
-                this.setToken(newToken);
-                return newToken;
-            }
+        if (this.token && this.isTokenValid(this.token) && !this.token.isExpiredIn(15, 'minutes')) {
             return this.token;
         }
+        return this.getOrRequestToken(() => this.fetchNewToken());
+    }
+    getOrRequestToken(fetchToken) {
+        if (this.pendingTokenRequest) {
+            return this.pendingTokenRequest;
+        }
+        const request = fetchToken()
+            .then((token) => {
+            if (this.pendingTokenRequest === request) {
+                this.setToken(token);
+            }
+            else if (this.token) {
+                return this.getToken();
+            }
+            return token;
+        })
+            .finally(() => {
+            if (this.pendingTokenRequest === request) {
+                this.pendingTokenRequest = undefined;
+            }
+        });
+        this.pendingTokenRequest = request;
+        return request;
+    }
+    async fetchNewToken() {
+        if (this.token && this.isTokenValid(this.token)) {
+            this.logger.info('Token expires within 15 minutes. Refreshing.');
+            return this.refreshToken();
+        }
         let token;
         try {
             if ('appId' in this.config && 'appKey' in this.config) {
@@ -156,7 +181,6 @@ export class AuthService extends BaseServiceAbstract {
             this.logger.error(message);
             throw new RocosError(message, errorCodes.AUTH_ERROR);
         }
-        this.setToken(token);
         return token;
     }
     /**
@@ -189,9 +213,8 @@ export class AuthService extends BaseServiceAbstract {
      */
     async refreshTokenIfExpired(minutes) {
         if (this.token?.isExpiredIn(minutes, 'minutes')) {
-            this.logger.info('Token expires in 15 minutes. Refreshing.');
-            const newToken = await this.refreshToken();
-            this.setToken(newToken);
+            this.logger.info(`Token expires in ${minutes} minutes. Refreshing.`);
+            await this.getOrRequestToken(() => this.refreshToken());
             return true;
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dronedeploy/rocos-js-sdk",
-  "version": "4.4.10",
+  "version": "4.4.12",
   "description": "Javascript SDK for rocos",
   "main": "cjs/index.js",
   "module": "esm/index.js",