npm - @camera.ui/server - Versions diffs - 2.1.4 → 2.1.5 - Mend

@camera.ui/server 2.1.4 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (208) hide show

package/dist/server/src/api/schemas/users.schema.d.ts CHANGED Viewed

@@ -199,6 +199,22 @@ export declare const userLanguageSchema: zod.ZodEnum<{
 export declare const userPreferencesRecordings: zod.ZodObject<{
     ungrouped: zod.ZodBoolean;
 }, zod.z.core.$strip>;
+export declare const userPreferencesNavLayout: zod.ZodObject<{
+    order: zod.ZodOptional<zod.ZodObject<{
+        main: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        manage: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        system: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        settings: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+    }, zod.z.core.$strip>>;
+    collapsible: zod.ZodOptional<zod.ZodObject<{
+        main: zod.ZodOptional<zod.ZodBoolean>;
+        manage: zod.ZodOptional<zod.ZodBoolean>;
+        system: zod.ZodOptional<zod.ZodBoolean>;
+        settings: zod.ZodOptional<zod.ZodBoolean>;
+    }, zod.z.core.$strip>>;
+    settingsInNav: zod.ZodOptional<zod.ZodBoolean>;
+    hidden: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+}, zod.z.core.$strip>;
 export declare const userPreferences: zod.ZodObject<{
     language: zod.ZodOptional<zod.ZodEnum<{
         auto: "auto";
@@ -263,6 +279,22 @@ export declare const userPreferences: zod.ZodObject<{
     recordings: zod.ZodOptional<zod.ZodObject<{
         ungrouped: zod.ZodBoolean;
     }, zod.z.core.$strip>>;
+    navLayout: zod.ZodOptional<zod.ZodNullable<zod.ZodObject<{
+        order: zod.ZodOptional<zod.ZodObject<{
+            main: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+            manage: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+            system: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+            settings: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        }, zod.z.core.$strip>>;
+        collapsible: zod.ZodOptional<zod.ZodObject<{
+            main: zod.ZodOptional<zod.ZodBoolean>;
+            manage: zod.ZodOptional<zod.ZodBoolean>;
+            system: zod.ZodOptional<zod.ZodBoolean>;
+            settings: zod.ZodOptional<zod.ZodBoolean>;
+        }, zod.z.core.$strip>>;
+        settingsInNav: zod.ZodOptional<zod.ZodBoolean>;
+        hidden: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+    }, zod.z.core.$strip>>>;
 }, zod.z.core.$strip>;
 export declare const passwordSchema: zod.ZodString;
 export declare const createUserSchema: zod.ZodObject<{
@@ -336,15 +368,31 @@ export declare const createUserSchema: zod.ZodObject<{
         recordings: zod.ZodOptional<zod.ZodObject<{
             ungrouped: zod.ZodBoolean;
         }, zod.z.core.$strip>>;
+        navLayout: zod.ZodOptional<zod.ZodNullable<zod.ZodObject<{
+            order: zod.ZodOptional<zod.ZodObject<{
+                main: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                manage: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                system: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                settings: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+            }, zod.z.core.$strip>>;
+            collapsible: zod.ZodOptional<zod.ZodObject<{
+                main: zod.ZodOptional<zod.ZodBoolean>;
+                manage: zod.ZodOptional<zod.ZodBoolean>;
+                system: zod.ZodOptional<zod.ZodBoolean>;
+                settings: zod.ZodOptional<zod.ZodBoolean>;
+            }, zod.z.core.$strip>>;
+            settingsInNav: zod.ZodOptional<zod.ZodBoolean>;
+            hidden: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        }, zod.z.core.$strip>>>;
     }, zod.z.core.$strip>>;
 }, zod.z.core.$strict>;
 export declare const loginUserSchema: zod.ZodObject<{
     username: zod.ZodString;
     password: zod.ZodString;
     kind: zod.ZodEnum<{
+        tv: "tv";
         native: "native";
         web: "web";
-        tv: "tv";
     }>;
     persistent: zod.ZodDefault<zod.ZodBoolean>;
     device: zod.ZodObject<{
@@ -423,6 +471,22 @@ export declare const patchUserSchema: zod.ZodObject<{
         recordings: zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{
             ungrouped: zod.ZodBoolean;
         }, zod.z.core.$strip>>>;
+        navLayout: zod.ZodOptional<zod.ZodOptional<zod.ZodNullable<zod.ZodObject<{
+            order: zod.ZodOptional<zod.ZodObject<{
+                main: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                manage: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                system: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+                settings: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+            }, zod.z.core.$strip>>;
+            collapsible: zod.ZodOptional<zod.ZodObject<{
+                main: zod.ZodOptional<zod.ZodBoolean>;
+                manage: zod.ZodOptional<zod.ZodBoolean>;
+                system: zod.ZodOptional<zod.ZodBoolean>;
+                settings: zod.ZodOptional<zod.ZodBoolean>;
+            }, zod.z.core.$strip>>;
+            settingsInNav: zod.ZodOptional<zod.ZodBoolean>;
+            hidden: zod.ZodOptional<zod.ZodArray<zod.ZodString>>;
+        }, zod.z.core.$strip>>>>;
     }, zod.z.core.$strip>>;
 }, zod.z.core.$strict>;
 export declare const usernameParamsSchema: zod.ZodObject<{

package/dist/server/src/api/schemas/users.schema.js CHANGED Viewed

@@ -95,11 +95,34 @@ export const userLanguageSchema = zod.enum(['auto', ...SUPPORTED_LANGUAGES]);
 export const userPreferencesRecordings = zod.object({
     ungrouped: zod.boolean(),
 });
+const navLayoutOrder = zod
+    .object({
+    main: zod.string().array(),
+    manage: zod.string().array(),
+    system: zod.string().array(),
+    settings: zod.string().array(),
+})
+    .partial();
+const navLayoutCollapsible = zod
+    .object({
+    main: zod.boolean(),
+    manage: zod.boolean(),
+    system: zod.boolean(),
+    settings: zod.boolean(),
+})
+    .partial();
+export const userPreferencesNavLayout = zod.object({
+    order: navLayoutOrder.optional(),
+    collapsible: navLayoutCollapsible.optional(),
+    settingsInNav: zod.boolean().optional(),
+    hidden: zod.string().array().optional(),
+});
 export const userPreferences = zod.object({
     language: userLanguageSchema.optional(),
     camview: userPreferencesCamview,
     cameras: zod.record(zod.string().trim(), userPreferencesCameras),
     recordings: userPreferencesRecordings.optional(),
+    navLayout: userPreferencesNavLayout.nullable().optional(),
 });
 export const passwordSchema = zod
     .string()

package/dist/server/src/api/schemas/users.schema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"users.schema.js","sourceRoot":"","sources":["../../../../../src/api/schemas/users.schema.ts"],"names":[],"mappings":"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~~CACjD~~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"}
1	+ {"version":3,"file":"users.schema.js","sourceRoot":"","sources":["../../../../../src/api/schemas/users.schema.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/services/users.service.js CHANGED Viewed

@@ -40,9 +40,11 @@ export class UsersService {
         return this.dbs.commit(this.dbs.usersDB, existing._id, (current) => {
             if (!current)
                 return undefined;
-            mergeWith(current, userData, (source, target) => {
+            mergeWith(current, userData, (source, target, key) => {
                 if (Array.isArray(source))
                     return target;
+                if (key === 'navLayout')
+                    return target;
             });
             return current;
         });

package/dist/server/src/api/services/users.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../../src/api/services/users.service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"users.service.js","sourceRoot":"","sources":["../../../../../src/api/services/users.service.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/types/index.d.ts CHANGED Viewed

@@ -73,6 +73,7 @@ export interface UserData {
     role: DBRoles;
     firstLogin: boolean;
     language: UserLanguage;
+    navLayout?: NavLayoutSettings | null;
     access_token: string;
     refresh_token: string;
     token_type: string;
@@ -544,6 +545,13 @@ export interface CamerasSettings {
     viewMode?: 'default' | 'grouped';
     dragDisabled: boolean;
 }
+export type NavGroup = 'main' | 'manage' | 'system';
+export interface NavLayoutSettings {
+    order?: Partial<Record<NavGroup | 'settings', string[]>>;
+    collapsible?: Partial<Record<NavGroup | 'settings', boolean>>;
+    settingsInNav?: boolean;
+    hidden?: string[];
+}
 export interface InterfaceSettinges {
     showBottomBarOnMobile: boolean;
     selectedSettingsView: SettingsViews;

package/dist/server/src/api/types/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAsGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;~~AAwDvC~~,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,cAAc,EAAE,aAAa,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,CAAC;IAChE,qBAAqB,EAAE,aAAa,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/F,yBAAyB,EAAE,aAAa,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAClG,iBAAiB,EAAE,aAAa,CAAC,uBAAuB,EAAE,MAAM,CAAC;CACzD,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAsGlD,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAyDvC,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,cAAc,EAAE,aAAa,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,CAAC;IAChE,qBAAqB,EAAE,aAAa,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC/F,yBAAyB,EAAE,aAAa,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAClG,iBAAiB,EAAE,aAAa,CAAC,uBAAuB,EAAE,MAAM,CAAC;CACzD,CAAC"}

package/dist/server/src/camera/decoder/detection-coordinator.js CHANGED Viewed

@@ -299,6 +299,11 @@ let DetectionCoordinator = class DetectionCoordinator {
             if (filtered.detected === true && this.eventManager.hasActiveEvent()) {
                 this.thumbnailer.fetchEventThumbnailAsync();
             }
+            // the camera reported the end (or zones dropped everything): nothing to
+            // localize or crop, and an assist hit on leftover scene objects (a
+            // parked car) would resurrect the span the camera just closed
+            if (filtered.detected !== true)
+                return;
             // assist alone is enough: its boxes upgrade zones, bboxes and thumbnails
             // even when no face/plate/clip secondary consumes them
             if (!this.plugins.hasFrameBasedSecondary() && !this.plugins.hasEligibleObjectAssist())
@@ -429,10 +434,16 @@ let DetectionCoordinator = class DetectionCoordinator {
         return this.plugins.has(sensorType);
     }
     externalObjectSpanActive() {
-        const objectPlugin = this.plugins.get(SensorType.Object);
-        if (!objectPlugin || objectPlugin.requiresFrames)
+        // the registry holds frame-based providers only; a smart-camera object
+        // sensor (Reolink AI, ONVIF) lives in the feeding set, and its dwell is
+        // what keeps the span open between its report edges
+        if (this.plugins.get(SensorType.Object)?.requiresFrames)
             return false;
-        return this.dwell.isActive(objectPlugin.sensorId);
+        for (const [sensorId, sensorType] of this.feedingSensors) {
+            if (sensorType === SensorType.Object && this.dwell.isActive(sensorId))
+                return true;
+        }
+        return false;
     }
     get cascadeEnabled() {
         return this.config.detectionSettings.cascadeDetection !== false;
@@ -619,28 +630,42 @@ let DetectionCoordinator = class DetectionCoordinator {
                 this.cascade.triggerMomentary(this.cascadeTimeoutSeconds);
             }
         }
-        else if (sensorType === SensorType.Object && detected) {
-            // the dwell bridges single missed frames; anchored stationary tracks
-            // don't refresh it, so parked objects can't hold events open
-            const detections = properties.detections ?? [];
-            if (detections.length > 0) {
-                this.dwell.refresh(sensorId, OBJECT_DWELL_SECONDS);
-                // a confirmed object re-arms the cascade like motion does: a time-based
-                // motion sensor (ONVIF cool-down) must not blind detection and split
-                // the event while someone is still mid-frame
-                if (this.cascadeEnabled) {
-                    this.cascade.triggerMomentary(this.cascadeTimeoutSeconds);
+        else if (sensorType === SensorType.Object) {
+            const framePlugin = this.plugins.get(SensorType.Object);
+            const frameBased = framePlugin?.requiresFrames === true && framePlugin.sensorId === sensorId;
+            if (detected) {
+                // the dwell bridges single missed frames; anchored stationary tracks
+                // don't refresh it, so parked objects can't hold events open
+                const detections = properties.detections ?? [];
+                if (detections.length > 0) {
+                    // frame results re-arm every tick, so 2s only bridges a dropped
+                    // frame; an external report is an edge that must hold until the
+                    // camera reports the end (cleared below), capped by the object
+                    // timeout in case that end never arrives
+                    const dwellSeconds = frameBased ? OBJECT_DWELL_SECONDS : Math.max(this.config.detectionSettings.object.timeout ?? 15, OBJECT_DWELL_SECONDS);
+                    this.dwell.refresh(sensorId, dwellSeconds);
+                    // a confirmed object re-arms the cascade like motion does: a time-based
+                    // motion sensor (ONVIF cool-down) must not blind detection and split
+                    // the event while someone is still mid-frame
+                    if (this.cascadeEnabled) {
+                        this.cascade.triggerMomentary(this.cascadeTimeoutSeconds);
+                    }
                 }
-            }
-            else {
-                // clear detected + buffer so no segment opens, the UI still gets
-                // the bboxes via the property publish below
-                properties.detected = false;
-                if (this.currentDetectionState.object) {
-                    this.currentDetectionState.object.detected = false;
-                    this.currentDetectionState.object.detections = [];
+                else {
+                    // clear detected + buffer so no segment opens, the UI still gets
+                    // the bboxes via the property publish below
+                    properties.detected = false;
+                    if (this.currentDetectionState.object) {
+                        this.currentDetectionState.object.detected = false;
+                        this.currentDetectionState.object.detections = [];
+                    }
                 }
             }
+            else if (!frameBased) {
+                // the camera's own end report closes the span; the segment linger
+                // still bridges flicker between two alarms
+                this.dwell.clear(sensorId);
+            }
         }
         // dwell owns detected/blocked/lastTriggered for these types, a no-detection
         // frame would overwrite the dwell-set state, so strip before publishing