@dnv-plant/typescriptpws 1.0.97 → 1.0.98-alpha.2397542

package/src/utilities.ts

@@ -6,9 +6,9 @@
  * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
  * Please contact DNV if you believe changes are required.
  *
- * Version:   1.0.97
- * Date/time: 13 Apr 2026 17:02:52
- * Template:  templates/typescriptpws/utilities.razor.
+ * Version:   1.0.0
+ * Date/time: 23 Jun 2026 12:11:11
+ * Template:  TYPE_SCRIPT_PWS/utilities.sbn.
  ***********************************************************************/
 
 import jwt from 'jsonwebtoken';
@@ -18,10 +18,12 @@ import { REST_API_URI, PWS_CLIENT_ID, REST_API_VERSION } from './constants';
 
 const accessTokenKey = '__pwsAccessToken';
 const usedInDnvKey = '__pwsUsedInDnvKey';
+const isAnalytics2Key = '__pwsIsAnalytics2';
 const clientAliasKey = '__pwsClientAliasId';
 
 (globalThis as any)[accessTokenKey] = (globalThis as any)[accessTokenKey] ?? '';
 (globalThis as any)[usedInDnvKey] = (globalThis as any)[usedInDnvKey] ?? false;
+(globalThis as any)[isAnalytics2Key] = (globalThis as any)[isAnalytics2Key] ?? false;
 (globalThis as any)[clientAliasKey] = (globalThis as any)[clientAliasKey] ?? PWS_CLIENT_ID;
 
 export function getAccessToken(): string {
@@ -42,6 +44,16 @@ export function setUsedInDnvProduct(value: boolean) {
   (globalThis as any)[usedInDnvKey] = value;
 }
 
+// For DNV use only
+function isAnalytics2(): boolean {
+  return (globalThis as any)[isAnalytics2Key];
+}
+
+// For DNV use only
+export function setAnalytics2(value: boolean) {
+  (globalThis as any)[isAnalytics2Key] = value;
+}
+
 // Get client alias ID
 export function getClientAliasId() {
   return (globalThis as any)[clientAliasKey];
@@ -55,8 +67,8 @@ export function setClientAliasId(clientAliasId: string) {
 // Get headers for requests
 function getHeaders(accessToken: string) {
   return {
-    'Content-Type': 'application/json',
-    Authorization: `Bearer ${accessToken}`,
+	'Content-Type': 'application/json',
+	Authorization: `Bearer ${accessToken}`,
   };
 }
 
@@ -66,17 +78,17 @@ const axiosInstance = axios.create({});
 export async function postRequest<T>(url: string, data: string, controller?: AbortController): Promise<AxiosResponse<T>> {
   const accessToken = getAccessToken();
   if (!accessToken) {
-    throw new Error('Access token not found');
+	throw new Error('Access token not found');
   }
 
   const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
   if (hasExpired) {
-    throw new Error(`Expired access token (${expiryDate})`);
+	throw new Error(`Expired access token (${expiryDate})`);
   }
 
   const response = await axiosInstance.post<T>(url, data, {
-    headers: getHeaders(accessToken),
-    signal: controller?.signal,
+	headers: getHeaders(accessToken),
+	signal: controller?.signal,
   });
   return response;
 }
@@ -85,17 +97,17 @@ export async function postRequest<T>(url: string, data: string, controller?: Abo
 export async function putRequest<T>(url: string, data: string, controller?: AbortController): Promise<AxiosResponse<T>> {
   const accessToken = getAccessToken();
   if (!accessToken) {
-    throw new Error('Access token not found');
+	throw new Error('Access token not found');
   }
 
   const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
   if (hasExpired) {
-    throw new Error(`Expired access token (${expiryDate})`);
+	throw new Error(`Expired access token (${expiryDate})`);
   }
 
   const response = await axiosInstance.put<T>(url, data, {
-    headers: getHeaders(accessToken),
-    signal: controller?.signal,
+	headers: getHeaders(accessToken),
+	signal: controller?.signal,
   });
   return response;
 }
@@ -104,18 +116,18 @@ export async function putRequest<T>(url: string, data: string, controller?: Abor
 export async function getRequest<T>(url: string, controller?: AbortController): Promise<AxiosResponse<T>> {
   const accessToken = getAccessToken();
   if (!accessToken) {
-    throw new Error('Access token not found');
+	throw new Error('Access token not found');
   }
 
   const [, expiryDate, hasExpired] = getAccessTokenInfo(accessToken);
   if (hasExpired) {
-    console.log(`Your access token has expired: ${expiryDate}`);
-    throw new Error('Expired access token');
+	console.log(`Your access token has expired: ${expiryDate}`);
+	throw new Error('Expired access token');
   }
 
   const response = await axiosInstance.get<T>(url, {
-    headers: getHeaders(accessToken),
-    signal: controller?.signal,
+	headers: getHeaders(accessToken),
+	signal: controller?.signal,
   });
   return response;
 }
@@ -126,14 +138,14 @@ function getAccessTokenInfo(accessToken: string): [string, string, boolean] {
 
   // Ensure the token is valid and contains the expected properties
   if (!decoded || typeof decoded !== 'object' || !('exp' in decoded)) {
-    throw new Error('Invalid or malformed token');
+	throw new Error('Invalid or malformed token');
   }
 
   const exp = decoded.exp as number;
   const aud = decoded.aud as string | undefined;
 
   if (typeof exp !== 'number') {
-    throw new Error('Token does not have a valid expiration time');
+	throw new Error('Token does not have a valid expiration time');
   }
 
   const platform = aud || 'unknown';
@@ -150,16 +162,16 @@ function getApiRoot() {
   const isDnvProduct = isUsedInDnvProduct();
 
   if (isDnvProduct) {
-    return '/api/';
+	return '/api/';
   }
 
   if (accessToken) {
-    const [platform] = getAccessTokenInfo(accessToken);
+	const [platform] = getAccessTokenInfo(accessToken);
 
-    // Determine API root based on devMode
-    const apiTarget = devMode ? '/api/' : `${platform}/api/`;
+	// Determine API root based on devMode
+	const apiTarget = devMode ? '/api/' : `${platform}/api/`;
 
-    return apiTarget;
+	return apiTarget;
   }
 
   return REST_API_URI;
@@ -172,7 +184,8 @@ function getApiVersion() {
 
 // Get analytics API target URL
 export function getAnalyticsApiTarget() {
-  return `${getApiRoot()}analytics/v${getApiVersion()}/`;
+  const analyticsName = isAnalytics2() ? 'analytics2' : 'analytics';
+  return `${getApiRoot()}${analyticsName}/v${getApiVersion()}/`;
 }
 
 // Get materials API target URL
@@ -188,4 +201,4 @@ export function convertSnakeCaseToCamelCase(snakeStr: string) {
 // Convert camelCase to snake_case
 export function convertCamelCaseToSnakeCase(camelStr: string) {
   return camelStr.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
-}
+}