@camera.ui/server 0.0.48 → 0.0.50-internal.0

package/dist/server/src/api/go2rtc/types.d.ts

@@ -9,21 +9,61 @@ export interface RTSPInfo {
     default_query: string;
     PacketSize: number;
 }
-export interface HomeKitResponse {
-    sources: HomeKitSource[];
+export type DeviceSourceType = 'Google' | 'Ring' | 'Roborock' | 'HomeKit' | 'Onvif' | 'Hass' | 'GoPro' | 'FFmpeg' | 'DVRip' | 'Webtorrent';
+export interface BaseDeviceSource {
+    url: string;
+    type: DeviceSourceType;
+}
+export interface DeviceSource extends BaseDeviceSource {
+    name?: string;
+    id?: string;
+    location?: string;
+}
+export interface HomeKitSource extends BaseDeviceSource {
+    name: string;
+    info: string;
+    url: string;
+    location: string;
+    type: 'HomeKit';
 }
-export interface HomeKitSource {
+export interface OnvifSource extends BaseDeviceSource {
+    id: string;
     name: string;
+    url: string;
     info: string;
+    type: 'Onvif';
+}
+export interface HassSource extends BaseDeviceSource {
+    name: string;
     url: string;
     location: string;
+    type: 'Hass';
 }
-export interface OnvifResponse {
-    sources: OnvifSource[];
+export interface GoProSource extends BaseDeviceSource {
+    name: string;
+    url: string;
+    type: 'GoPro';
+}
+export interface FFmpegSource extends BaseDeviceSource {
+    name: string;
+    url: string;
+    type: 'FFmpeg';
 }
-export interface OnvifSource {
+export interface DVRipSource extends BaseDeviceSource {
     name: string;
     url: string;
+    type: 'DVRip';
+}
+export interface WebtorrentSource extends BaseDeviceSource {
+    id: string;
+    url: string;
+    type: 'Webtorrent';
+}
+export interface HomeKitPairResponse {
+    source: {
+        name: string;
+        url: string;
+    };
 }
 export interface ExitData {
     code: number;
@@ -34,8 +74,16 @@ export interface NameData {
 export interface SourceData {
     src: string;
 }
+export interface HomeKitPairData {
+    id: string;
+    url: string;
+    pin: string;
+}
+export interface UnpairData {
+    id: string;
+}
 export interface CreateStreamData {
-    name?: string;
+    name: string;
     src: string[];
 }
 export interface UpdateStreamData {
@@ -46,6 +94,10 @@ export interface IntercomData {
     name: string;
     dst: string;
 }
+export interface SourceLoginData {
+    username?: string;
+    password?: string;
+}
 export interface Go2RTCCodec {
     codec_name: string;
     codec_type: string;
@@ -55,19 +107,20 @@ export interface Go2RTCCodec {
     channels?: number;
 }
 export interface Go2RTCReceiver {
-    id: string;
+    id: number;
     codec: Go2RTCCodec;
     childs: number[];
 }
 export interface Go2RTCSender {
-    id: string;
+    id: number;
     codec: Go2RTCCodec;
     parent: number;
 }
 export interface Go2RTCProducer {
-    id?: string;
+    id?: number;
     format_name?: string;
     protocol?: string;
+    source?: string;
     remote_addr?: string;
     url?: string;
     sdp?: string;
@@ -77,12 +130,14 @@ export interface Go2RTCProducer {
     senders?: Go2RTCSender[];
 }
 export interface Go2RTCConsumer {
-    id: string;
+    id: number;
     format_name: string;
     protocol: string;
     remote_addr: string;
     user_agent: string;
     medias: string[];
+    source?: string;
+    sdp?: string;
     receivers?: Go2RTCReceiver[];
     senders?: Go2RTCSender[];
 }

package/dist/server/src/api/index.d.ts

@@ -6,6 +6,7 @@ export declare class Server {
     private api;
     private logger;
     private configService;
+    private proxyServer;
     constructor();
     register(): Promise<void>;
     listen(): Promise<void>;
@@ -14,9 +15,12 @@ export declare class Server {
     private registerPlugins;
     private registerRouters;
     private get corsOptions();
+    private get natsProxyOptions();
+    private get go2rtcProxyOptions();
     private get helmetOptions();
     private get serverOptions();
     private qsParser;
     private get socketOptions();
+    private get multipartOptions();
     private get staticOptions();
 }

package/dist/server/src/api/index.js

@@ -13,21 +13,23 @@ import { ConfigService } from '../services/config/index.js';
 import { RUNTIME_STATUS } from '../services/config/types.js';
 import { HeaderPlugin } from './plugins/header.plugin.js';
 // import { LoggerPlugin } from './plugins/logger.plugin.js';
+import { ProxyPlugin } from './plugins/proxy.plugin.js';
 import { SocketIoPlugin } from './plugins/socket.plugin.js';
 import { SystemPlugin } from './plugins/system.plugin.js';
 import { UserAgentPlugin } from './plugins/useragent.plugin.js';
 import { FastifyRoutes } from './routes/index.js';
-import { CertificateGeneration } from './utils/cert.js';
 export class Server {
     isRunning = false;
     app;
     api;
     logger;
     configService;
+    proxyServer;
     constructor() {
+        this.api = container.resolve('api');
         this.logger = container.resolve('logger');
         this.configService = container.resolve('configService');
-        this.api = container.resolve('api');
+        this.proxyServer = container.resolve('proxy');
     }
     async register() {
         this.app = Fastify(this.serverOptions);
@@ -46,7 +48,7 @@ export class Server {
             throw new Error('Fastify instance not initialized');
         }
         await this.app.listen({
-            host: '0.0.0.0',
+            host: '::',
             port: this.configService.config.port,
         });
         this.isRunning = true;
@@ -90,9 +92,11 @@ export class Server {
         await this.app?.register(HeaderPlugin);
         await this.app?.register(FastifyHelmet, this.helmetOptions);
         await this.app?.register(FastifyCors, this.corsOptions);
+        await this.app?.register(ProxyPlugin, this.natsProxyOptions);
+        await this.app?.register(ProxyPlugin, this.go2rtcProxyOptions);
         await this.app?.register(FastifyFormbody);
         await this.app?.register(UserAgentPlugin);
-        await this.app?.register(FastifyMultipart);
+        await this.app?.register(FastifyMultipart, this.multipartOptions);
         await this.app?.register(FastifyStatic, this.staticOptions);
     }
     async registerRouters() {
@@ -102,9 +106,35 @@ export class Server {
         }
     }
     get corsOptions() {
-        const go2rtcPort = parseInt(this.configService.go2rtcConfig.api.listen.split(':')[1]);
         return {
-            origin: [`http://127.0.0.1:${go2rtcPort}`, `https://127.0.0.1:${this.configService.config.port}`, `http://127.0.0.1:${this.configService.UI_PORT}`],
+            origin: [`https://127.0.0.1:${this.configService.config.port}`, `http://127.0.0.1:${this.configService.UI_PORT}`],
+        };
+    }
+    get natsProxyOptions() {
+        return {
+            upstream: `wss://localhost:${this.proxyServer.server.wsPort}`,
+            prefix: '/proxy',
+            target: 'nats',
+            tls: {
+                cert: this.configService.ssl.cert,
+                key: this.configService.ssl.key,
+                ca: this.configService.ssl.ca,
+                rejectUnauthorized: false,
+            },
+        };
+    }
+    get go2rtcProxyOptions() {
+        const go2rtcAddress = this.configService.go2rtcAddress('ws');
+        return {
+            upstream: `${go2rtcAddress}/api/ws`,
+            prefix: '/go2rtc',
+            target: 'go2rtc',
+            tls: {
+                cert: this.configService.ssl.cert,
+                key: this.configService.ssl.key,
+                ca: this.configService.ssl.ca,
+                rejectUnauthorized: false,
+            },
         };
     }
     get helmetOptions() {
@@ -148,7 +178,6 @@ export class Server {
     //   };
     // }
     get serverOptions() {
-        const { cert, key } = CertificateGeneration.generateCert();
         return {
             bodyLimit: 1e8,
             disableRequestLogging: true,
@@ -158,8 +187,9 @@ export class Server {
             https: {
                 rejectUnauthorized: false,
                 allowHTTP1: true,
-                key: key,
-                cert: cert,
+                cert: this.configService.ssl.cert,
+                key: this.configService.ssl.key,
+                ca: this.configService.ssl.ca,
             },
             querystringParser: this.qsParser.bind(this),
         };
@@ -191,6 +221,12 @@ export class Server {
             pingTimeout: 60000,
             pingInterval: 25000,
             transports: ['websocket', 'polling'],
+            path: '/socket.io',
+        };
+    }
+    get multipartOptions() {
+        return {
+            attachFieldsToBody: true,
         };
     }
     get staticOptions() {

package/dist/server/src/api/index.js.map

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

package/dist/server/src/api/middlewares/authPermission.middleware.d.ts

@@ -1,5 +1,6 @@
 import type { FastifyReply, FastifyRequest } from 'fastify';
 import type { AuthLoginRequest, AuthParamsRequest } from '../types/index.js';
+export declare const onlyMasterCanDoThisAction: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply>;
 export declare const onlyAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest>, reply: FastifyReply) => Promise<FastifyReply>;
 export declare const onlySameUserOrAdminCanDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply>;
 export declare const sameUserCantDoThisAction: (req: FastifyRequest<AuthLoginRequest & AuthParamsRequest>, reply: FastifyReply) => Promise<FastifyReply>;

package/dist/server/src/api/middlewares/authPermission.middleware.js

@@ -1,5 +1,14 @@
+export const onlyMasterCanDoThisAction = async (req, reply) => {
+    if (req.locals.user?.role !== 'master') {
+        return reply.code(403).send({
+            statusCode: 403,
+            message: 'Forbidden',
+        });
+    }
+    return {};
+};
 export const onlyAdminCanDoThisAction = async (req, reply) => {
-    if (req.locals.user?.role !== 'admin') {
+    if (req.locals.user?.role !== 'admin' && req.locals.user?.role !== 'master') {
         return reply.code(403).send({
             statusCode: 403,
             message: 'Forbidden',
@@ -8,7 +17,7 @@ export const onlyAdminCanDoThisAction = async (req, reply) => {
     return {};
 };
 export const onlySameUserOrAdminCanDoThisAction = async (req, reply) => {
-    if (req.locals.user?.username !== req.params?.username && req.locals.user?.role !== 'admin') {
+    if (req.locals.user?.username !== req.params?.username && req.locals.user?.role !== 'admin' && req.locals.user?.role !== 'master') {
         return reply.code(403).send({
             statusCode: 403,
             message: 'Forbidden',

package/dist/server/src/api/middlewares/authPermission.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"authPermission.middleware.js","sourceRoot":"","sources":["../../../../../src/api/middlewares/authPermission.middleware.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAqC,EAAE,KAAmB,EAAyB,EAAE;IAClI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QACtC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IAChK,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;QAC5F,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IACtJ,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC"}
+{"version":3,"file":"authPermission.middleware.js","sourceRoot":"","sources":["../../../../../src/api/middlewares/authPermission.middleware.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAAE,GAAqC,EAAE,KAAmB,EAAyB,EAAE;IACnI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAqC,EAAE,KAAmB,EAAyB,EAAE;IAClI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC5E,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IAChK,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,KAAK,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClI,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,GAAyD,EAAE,KAAmB,EAAyB,EAAE;IACtJ,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YAC1B,UAAU,EAAE,GAAG;YACf,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAkB,CAAC;AAC5B,CAAC,CAAC"}

package/dist/server/src/api/middlewares/authValidation.middleware.js

@@ -20,8 +20,16 @@ export const isPasswordAndUserMatch = async (req, reply) => {
         const hash = createHmac('sha512', salt).update(req.body.password).digest('base64');
         if (hash === passwordFields[1]) {
             req.locals.user = {
-                ...user,
+                _id: user._id,
+                avatar: user.avatar,
+                firstLogin: user.firstLogin,
+                singleSession: user.singleSession,
+                password: user.password,
+                preferences: user.preferences,
                 rememberMe: req.body.rememberMe,
+                role: user.role,
+                sessionTimer: user.sessionTimer,
+                username: user.username,
             };
             return {};
         }
@@ -49,30 +57,30 @@ export const validJWTNeeded = async (req, reply) => {
             if (hash === passwordFields[1]) {
                 const payload = {
                     _id: user._id,
-                    avatar: user.avatar,
+                    // avatar: user.avatar,
                     username: user.username,
-                    role: user.role,
+                    // role: user.role,
                     rememberMe: user.rememberMe,
-                    oneLogin: user.oneLogin,
-                    firstLogin: user.firstLogin,
+                    // singleSession: user.singleSession,
+                    // firstLogin: user.firstLogin,
                     sessionTimer: user.sessionTimer,
                 };
                 const payloadRefresh = {
                     _id: user._id,
                 };
                 const access_token = jwt.sign(payload, configService.SECRETS.jwtAccessKey, {
-                    expiresIn: user.sessionTimer,
+                    expiresIn: user.rememberMe ? '100y' : user.sessionTimer,
                 });
                 const refresh_token = jwt.sign(payloadRefresh, configService.SECRETS.jwtRefreshKey, {
-                    expiresIn: REFRESH_TOKEN.EXPIRES_IN,
+                    expiresIn: user.rememberMe ? '100y' : REFRESH_TOKEN.EXPIRES_IN,
                 });
                 tokenEncoded = {
                     _id: user._id,
                     access_token: access_token,
                     refresh_token: refresh_token,
                     token_type: 'Bearer',
-                    expires_in: user.sessionTimer,
-                    expires_at: new Date((Date.now() / 1000 + user.sessionTimer) * 1000),
+                    expires_in: user.rememberMe ? 100 * 365 * 24 * 60 * 60 : user.sessionTimer,
+                    expires_at: user.rememberMe ? new Date((Date.now() / 1000 + 100 * 365 * 24 * 60 * 60) * 1000) : new Date((Date.now() / 1000 + user.sessionTimer) * 1000),
                 };
                 req.headers.authorization = `Bearer ${access_token}`;
             }
@@ -91,8 +99,8 @@ export const validJWTNeeded = async (req, reply) => {
             else {
                 // check if token exists in database and is still valid
                 const token = tokenEncoded ?? authService.findByToken(authorization[1]);
-                const tokenExpired = token ? new Date(token.expires_at).getTime() < new Date().getTime() : null;
-                if (!token || tokenExpired) {
+                const tokenValid = authService.checkToken(token?.access_token ?? '');
+                if (!token || !tokenValid) {
                     return reply.code(401).send({
                         statusCode: 401,
                         message: !token ? 'Unauthorized' : 'Token expired',
@@ -107,7 +115,7 @@ export const validJWTNeeded = async (req, reply) => {
                 }
                 req.locals = {
                     user,
-                    jwt: jwt.verify(authorization[1], configService.SECRETS.jwtAccessKey),
+                    jwt: jwt.verify(token.access_token, configService.SECRETS.jwtAccessKey),
                 };
                 return {};
             }

package/dist/server/src/api/middlewares/authValidation.middleware.js.map

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

package/dist/server/src/api/middlewares/pagination.middleware.js

@@ -1,65 +1,57 @@
-import { PAGINATION_DEFAULTS } from '../types/index.js';
+const PAGINATION_DEFAULTS = {
+    START: 0,
+    PAGE: 1,
+    PAGE_SIZE: -1,
+};
+const validateQuery = (query, totalItems) => {
+    return {
+        start: Math.max(0, Math.min(query.start, totalItems - 1)),
+        page: Math.max(1, query.page),
+        pageSize: query.pageSize === -1 ? -1 : Math.max(1, query.pageSize),
+    };
+};
 export const pages = async (req, reply, payload) => {
     if (reply.statusCode >= 400) {
         return;
     }
-    let pagination;
-    let result;
-    const items = payload || [];
-    const validateQuery = (query) => {
-        const queryStart = parseInt(query.start);
-        const start = !isNaN(queryStart) ? queryStart : undefined;
-        const page = parseInt(query.page) || PAGINATION_DEFAULTS.page;
-        const pageSize = parseInt(query.pageSize) || PAGINATION_DEFAULTS.pageSize;
-        if (pageSize === -1) {
-            return;
-        }
-        return {
-            start,
-            page: query.page ? (page < PAGINATION_DEFAULTS.page ? PAGINATION_DEFAULTS.page : page) : PAGINATION_DEFAULTS.page,
-            pageSize: query.page ? (pageSize > PAGINATION_DEFAULTS.pageSize ? PAGINATION_DEFAULTS.pageSize : pageSize) : PAGINATION_DEFAULTS.pageSize,
-        };
+    const items = payload ?? [];
+    const rawQuery = {
+        start: req.query.start ?? PAGINATION_DEFAULTS.START,
+        page: req.query.page ?? PAGINATION_DEFAULTS.PAGE,
+        pageSize: req.query.pageSize ?? PAGINATION_DEFAULTS.PAGE_SIZE,
     };
-    const query = validateQuery(req.query);
-    if (!query) {
-        pagination = {
-            pageSize: -1,
-            startIndex: 0,
-            endIndex: items.length - 1,
-            totalItems: items.length,
+    const query = validateQuery(rawQuery, items.length);
+    if (query.pageSize === -1) {
+        return {
+            pagination: {
+                currentPage: 1,
+                pageSize: -1,
+                totalPages: 1,
+                startIndex: query.start,
+                endIndex: items.length - 1,
+                totalItems: items.length,
+            },
+            result: items.slice(query.start),
         };
-        result = items;
-    }
-    else {
-        const maxPage = Math.ceil(items.length / query.pageSize);
-        const totalItems = items.length;
-        const startIndex = query.start ?? (query.page - 1) * query.pageSize;
-        const endIndex = Math.min(startIndex + query.pageSize - 1, totalItems - 1);
-        if (query.start) {
-            pagination = {
-                currentPage: query.page,
-                pageSize: query.pageSize,
-                totalPages: maxPage,
-                startIndex: startIndex,
-                endIndex: endIndex,
-                totalItems: totalItems,
-                nextPageQuery: query.page < items.length / query.pageSize ? `?page=${query.page + 1}` : null,
-                prevPageQuery: query.page > 1 ? `?page=${query.page - 1}` : null,
-            };
-        }
-        else {
-            pagination = {
-                pageSize: query.pageSize,
-                startIndex: startIndex,
-                endIndex: endIndex,
-                totalItems: totalItems,
-            };
-        }
-        result = items.slice(pagination.startIndex, pagination.endIndex + 1);
     }
+    const totalItems = items.length;
+    const totalPages = Math.ceil(totalItems / query.pageSize);
+    const currentPage = query.start !== PAGINATION_DEFAULTS.START ? Math.ceil((query.start + 1) / query.pageSize) : Math.min(query.page, totalPages);
+    const startIndex = query.start !== PAGINATION_DEFAULTS.START ? query.start : (currentPage - 1) * query.pageSize;
+    const endIndex = Math.min(startIndex + query.pageSize - 1, totalItems - 1);
+    const pagination = {
+        currentPage,
+        pageSize: query.pageSize,
+        totalPages,
+        startIndex,
+        endIndex,
+        totalItems,
+        nextPageQuery: currentPage < totalPages ? `?page=${currentPage + 1}&start=${startIndex + query.pageSize}` : null,
+        prevPageQuery: currentPage > 1 ? `?page=${currentPage - 1}&start=${Math.max(0, startIndex - query.pageSize)}` : null,
+    };
     return {
         pagination,
-        result,
+        result: items.slice(startIndex, endIndex + 1),
     };
 };
 //# sourceMappingURL=pagination.middleware.js.map

package/dist/server/src/api/middlewares/pagination.middleware.js.map

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

package/dist/server/src/api/plugins/proxy.plugin.d.ts

@@ -0,0 +1,14 @@
+import type { FastifyPluginAsync } from 'fastify';
+export interface ProxyTLSOptions {
+    cert: string | Buffer;
+    key: string | Buffer;
+    ca: string | Buffer;
+    rejectUnauthorized?: boolean;
+}
+export interface ProxyOptions {
+    upstream: string;
+    prefix: string;
+    target: 'nats' | 'go2rtc';
+    tls?: ProxyTLSOptions;
+}
+export declare const ProxyPlugin: FastifyPluginAsync<ProxyOptions>;