@placeos/ts-client 4.7.7 → 4.7.10

package/dist/modules/module.d.ts

@@ -1,3 +1,4 @@
+import { AlertSeverity } from '../alerts/alert';
 import { PlaceDriver } from '../drivers/driver';
 import { PlaceDriverRole } from '../drivers/enums';
 import { PlaceResource } from '../resources/resource';
@@ -62,6 +63,8 @@ export declare class PlaceModule extends PlaceResource {
     readonly has_runtime_error: boolean;
     /** Timestamp of the last runtime error in ms since UTC epoch */
     readonly error_timestamp: number;
+    /**  */
+    readonly alert_level: AlertSeverity;
     /** ID of the system associated with the module */
     get system_id(): string;
     constructor(raw_data?: PlaceModuleComplete);

package/dist/systems/system.d.ts

@@ -37,8 +37,8 @@ export declare class PlaceSystem extends PlaceResource {
     readonly support_url: string;
     /** URL for the timetable UI linked to the system */
     readonly timetable_url: string;
-    /** URL for requesting snapshots of the assosiated camera */
-    readonly camera_snapshot_url: string;
+    /** URLs for requesting snapshots of the assosiated camera */
+    readonly camera_snapshot_urls: string[];
     /** URL for managing the attached camera */
     readonly camera_url: string;
     /** External booking URL for the system */

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.7.7",
+    "version": "4.7.10",
     "license": "MIT",
     "name": "@placeos/ts-client",
     "author": "Alex Sorafumo <alex@place.tech>",

package/src/auth/functions.ts

@@ -90,6 +90,25 @@ const _online_observer = _online.asObservable();
 
 let _failed_count = 0;
 
+/**
+ * @private
+ * Resolve a URL against the authority's domain if it is a relative path.
+ * If the URL is already absolute (starts with http:// or https://), return as-is.
+ * If the URL is relative (starts with /), prepend the protocol and authority domain.
+ */
+function resolveAuthorityUrl(url: string): string {
+    if (!url || url.startsWith('http://') || url.startsWith('https://')) {
+        return url;
+    }
+    const domain = _authority?.domain;
+    if (domain) {
+        const secure =
+            _options.secure || window.location?.protocol.indexOf('https') >= 0;
+        return `${secure ? 'https:' : 'http:'}//${domain}${url}`;
+    }
+    return url;
+}
+
 /** API Endpoint for the retrieved version of PlaceOS */
 export function apiEndpoint(): string {
     const secure =
@@ -398,7 +417,9 @@ export function authorise(
  * Logout and clear user credentials for the application
  */
 export function logout(): void {
-    const url = _authority ? _authority.logout_url : '/logout';
+    const url = resolveAuthorityUrl(
+        _authority ? _authority.logout_url : '/logout',
+    );
     fetch(url, {
         method: 'GET',
         redirect: 'manual',
@@ -582,10 +603,12 @@ export function sendToLogin(api_authority: PlaceAuthority): void {
     /* istanbul ignore else */
     if (_options.handle_login !== false && !_redirecting) {
         log('Auth', 'Redirecting to login page...');
-        // Redirect to login form
-        const url = api_authority!.login_url?.replace(
-            '{{url}}',
-            encodeURIComponent(window.location?.href),
+        // Redirect to login form, resolving relative URLs against the authority domain
+        const url = resolveAuthorityUrl(
+            api_authority!.login_url?.replace(
+                '{{url}}',
+                encodeURIComponent(window.location?.href),
+            ),
         );
         setTimeout(() => window.location?.assign(url), 300);
         _redirecting = true;

package/src/drivers/driver.ts

@@ -1,3 +1,4 @@
+import { AlertSeverity } from '../alerts/alert';
 import { PlaceResource } from '../resources/resource';
 import { EncryptionLevel } from '../settings/interfaces';
 import { PlaceSettings } from '../settings/settings';
@@ -32,6 +33,8 @@ export class PlaceDriver extends PlaceResource {
         author: string;
         date: string;
     };
+    /**  */
+    public readonly alert_level: AlertSeverity;
     /** Tuple of user settings of differring encryption levels for the driver */
     public readonly settings: [
         PlaceSettings | null,
@@ -54,6 +57,7 @@ export class PlaceDriver extends PlaceResource {
         this.commit = raw_data.commit || '';
         this.update_available = raw_data.update_available || false;
         this.update_info = raw_data.update_info;
+        this.alert_level = raw_data.alert_level || 'medium';
         this.settings = raw_data.settings || [null, null, null, null];
         if (typeof this.settings !== 'object') {
             (this as any).settings = [null, null, null, null];

package/src/modules/module.ts

@@ -1,3 +1,4 @@
+import { AlertSeverity } from '../alerts/alert';
 import { PlaceDriver } from '../drivers/driver';
 import { PlaceDriverRole } from '../drivers/enums';
 import { PlaceResource } from '../resources/resource';
@@ -66,6 +67,8 @@ export class PlaceModule extends PlaceResource {
     public readonly has_runtime_error: boolean;
     /** Timestamp of the last runtime error in ms since UTC epoch */
     public readonly error_timestamp: number;
+    /**  */
+    public readonly alert_level: AlertSeverity;
     /** ID of the system associated with the module */
     public get system_id(): string {
         return this.control_system_id;
@@ -96,6 +99,7 @@ export class PlaceModule extends PlaceResource {
         this.error_timestamp = raw_data.error_timestamp || 0;
         this.driver = new PlaceDriver(raw_data.dependency || raw_data.driver);
         this.settings = raw_data.settings || [null, null, null, null];
+        this.alert_level = raw_data.alert_level || 'medium';
         if (typeof this.settings !== 'object') {
             (this as any).settings = [null, null, null, null];
         }

package/src/systems/system.ts

@@ -40,8 +40,8 @@ export class PlaceSystem extends PlaceResource {
     public readonly support_url: string;
     /** URL for the timetable UI linked to the system */
     public readonly timetable_url: string;
-    /** URL for requesting snapshots of the assosiated camera */
-    public readonly camera_snapshot_url: string;
+    /** URLs for requesting snapshots of the assosiated camera */
+    public readonly camera_snapshot_urls: string[];
     /** URL for managing the attached camera */
     public readonly camera_url: string;
     /** External booking URL for the system */
@@ -85,7 +85,7 @@ export class PlaceSystem extends PlaceResource {
         this.public = raw_data.public ?? false;
         this.installed_ui_devices = raw_data.installed_ui_devices || 0;
         this.support_url = raw_data.support_url || '';
-        this.camera_snapshot_url = raw_data.camera_snapshot_url || '';
+        this.camera_snapshot_urls = raw_data.camera_snapshot_urls || [];
         this.camera_url = raw_data.camera_url || '';
         this.timetable_url = raw_data.timetable_url || '';
         this.room_booking_url = raw_data.room_booking_url || '';