@dronedeploy/rocos-js-sdk 4.4.11 → 4.4.13

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/cjs/services/ProfileService.d.ts

@@ -247,16 +247,17 @@ export declare class ProfileService extends BaseServiceAbstract implements IBase
      * @param profileData - Robot definition data
      * @param newName - Optional new name for the robot definition. If not provided, the name from the imported definition will be used.
      * @param newDescription - Optional new description for the robot definition. If not provided, the description from the imported definition will be used.
+     * @param replaceExisting - Move robots from same-named definitions to the import and delete those definitions.
      *
      * @see export
      */
-    import(projectId: string, profileData: Blob | File, newName?: string, newDescription?: string): Promise<{
+    import(projectId: string, profileData: Blob | File, newName?: string, newDescription?: string, replaceExisting?: boolean): Promise<{
         profileId: string;
     }>;
     getLibraryProfiles(): Promise<(RobotProfile & {
         last_modified: Date;
     })[]>;
-    importFromLibrary(projectId: string, profileId: string, name?: string, description?: string): Promise<{
+    importFromLibrary(projectId: string, profileId: string, name?: string, description?: string, replaceExisting?: boolean): Promise<{
         profileId: string;
     }>;
     /**

package/cjs/services/ProfileService.js

@@ -343,10 +343,11 @@ class ProfileService extends BaseServiceAbstract_1.BaseServiceAbstract {
      * @param profileData - Robot definition data
      * @param newName - Optional new name for the robot definition. If not provided, the name from the imported definition will be used.
      * @param newDescription - Optional new description for the robot definition. If not provided, the description from the imported definition will be used.
+     * @param replaceExisting - Move robots from same-named definitions to the import and delete those definitions.
      *
      * @see export
      */
-    async import(projectId, profileData, newName, newDescription) {
+    async import(projectId, profileData, newName, newDescription, replaceExisting) {
         const formData = new FormData();
         if (newName) {
             formData.append('name', newName);
@@ -354,6 +355,9 @@ class ProfileService extends BaseServiceAbstract_1.BaseServiceAbstract {
         if (newDescription) {
             formData.append('description', newDescription);
         }
+        if (replaceExisting) {
+            formData.append('replaceExisting', 'true');
+        }
         formData.append('file', profileData);
         return this.callPost((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_PROJECT_DEFINITION_IMPORT, { url: this.config.url, projectId }, this.config.insecure), formData, `Failed to import robot definition for ${projectId}.`);
     }
@@ -364,8 +368,8 @@ class ProfileService extends BaseServiceAbstract_1.BaseServiceAbstract {
             last_modified: new Date(profile.last_modified),
         }));
     }
-    async importFromLibrary(projectId, profileId, name, description) {
-        return this.callPost((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_PROJECT_DEFINITION_IMPORT_LIBRARY, { url: this.config.url, projectId, profileId }, this.config.insecure), { name, description }, `Failed to import library profile ${profileId} into project ${projectId}.`);
+    async importFromLibrary(projectId, profileId, name, description, replaceExisting) {
+        return this.callPost((0, formatServiceUrl_1.formatServiceUrl)(api_1.API_PROJECT_DEFINITION_IMPORT_LIBRARY, { url: this.config.url, projectId, profileId }, this.config.insecure), { name, description, ...(replaceExisting ? { replaceExisting } : {}) }, `Failed to import library profile ${profileId} into project ${projectId}.`);
     }
     /**
      * Update gamepads for a robot definition

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/esm/services/ProfileService.d.ts

@@ -247,16 +247,17 @@ export declare class ProfileService extends BaseServiceAbstract implements IBase
      * @param profileData - Robot definition data
      * @param newName - Optional new name for the robot definition. If not provided, the name from the imported definition will be used.
      * @param newDescription - Optional new description for the robot definition. If not provided, the description from the imported definition will be used.
+     * @param replaceExisting - Move robots from same-named definitions to the import and delete those definitions.
      *
      * @see export
      */
-    import(projectId: string, profileData: Blob | File, newName?: string, newDescription?: string): Promise<{
+    import(projectId: string, profileData: Blob | File, newName?: string, newDescription?: string, replaceExisting?: boolean): Promise<{
         profileId: string;
     }>;
     getLibraryProfiles(): Promise<(RobotProfile & {
         last_modified: Date;
     })[]>;
-    importFromLibrary(projectId: string, profileId: string, name?: string, description?: string): Promise<{
+    importFromLibrary(projectId: string, profileId: string, name?: string, description?: string, replaceExisting?: boolean): Promise<{
         profileId: string;
     }>;
     /**

package/esm/services/ProfileService.js

@@ -340,10 +340,11 @@ export class ProfileService extends BaseServiceAbstract {
      * @param profileData - Robot definition data
      * @param newName - Optional new name for the robot definition. If not provided, the name from the imported definition will be used.
      * @param newDescription - Optional new description for the robot definition. If not provided, the description from the imported definition will be used.
+     * @param replaceExisting - Move robots from same-named definitions to the import and delete those definitions.
      *
      * @see export
      */
-    async import(projectId, profileData, newName, newDescription) {
+    async import(projectId, profileData, newName, newDescription, replaceExisting) {
         const formData = new FormData();
         if (newName) {
             formData.append('name', newName);
@@ -351,6 +352,9 @@ export class ProfileService extends BaseServiceAbstract {
         if (newDescription) {
             formData.append('description', newDescription);
         }
+        if (replaceExisting) {
+            formData.append('replaceExisting', 'true');
+        }
         formData.append('file', profileData);
         return this.callPost(formatServiceUrl(API_PROJECT_DEFINITION_IMPORT, { url: this.config.url, projectId }, this.config.insecure), formData, `Failed to import robot definition for ${projectId}.`);
     }
@@ -361,8 +365,8 @@ export class ProfileService extends BaseServiceAbstract {
             last_modified: new Date(profile.last_modified),
         }));
     }
-    async importFromLibrary(projectId, profileId, name, description) {
-        return this.callPost(formatServiceUrl(API_PROJECT_DEFINITION_IMPORT_LIBRARY, { url: this.config.url, projectId, profileId }, this.config.insecure), { name, description }, `Failed to import library profile ${profileId} into project ${projectId}.`);
+    async importFromLibrary(projectId, profileId, name, description, replaceExisting) {
+        return this.callPost(formatServiceUrl(API_PROJECT_DEFINITION_IMPORT_LIBRARY, { url: this.config.url, projectId, profileId }, this.config.insecure), { name, description, ...(replaceExisting ? { replaceExisting } : {}) }, `Failed to import library profile ${profileId} into project ${projectId}.`);
     }
     /**
      * Update gamepads for a robot definition

package/package.json

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