Merge pull request #407 from dfpc-coe/video-lease-commit

PATCH update calls to Media Server
dfpc-coe · Oct 31, 2024 · ad3439e · ad3439e
2 parents ec145d6 + 37fc4bf
commit ad3439e
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 20 deletions.
diff --git a/api/lib/api/mission.ts b/api/lib/api/mission.ts
@@ -384,7 +384,7 @@ export default class {
     async subscriptionRoles(
         name: string,
         opts?: Static<typeof MissionOptions>
-    ): Promise<TAKList<Array<Static<typeof MissionSubscriber>>>> {
+    ): Promise<TAKList<Static<typeof MissionSubscriber>>> {
         const url = this.#isGUID(name)
             ? new URL(`/Marti/api/missions/guid/${encodeURIComponent(name)}/subscriptions/roles`, this.api.url)
             : new URL(`/Marti/api/missions/${this.#encodeName(name)}/subscriptions/roles`, this.api.url);

diff --git a/api/lib/control/video-service.ts b/api/lib/control/video-service.ts
@@ -2,6 +2,7 @@ import Err from '@openaddresses/batch-error';
 import Config from '../config.js';
 import { Type, Static } from '@sinclair/typebox';
 import { VideoLeaseResponse } from '../types.js';
+import moment from 'moment';
 import fetch from '../fetch.js';
 
 export const Protocols = Type.Object({
@@ -279,7 +280,6 @@ export default class VideoServiceControl {
         proxy?: string;
     }): Promise<Static<typeof VideoLeaseResponse>> {
         const video = await this.settings();
-
         if (!video.configured) throw new Err(400, null, 'Media Integration is not configured');
 
         const headers = this.headers(video.username, video.password);
@@ -349,6 +349,57 @@ export default class VideoServiceControl {
         return lease;
     }
 
+    async commit(leaseid: string, body: { name?: string, duration?: number }, opts: {
+        username: string;
+        admin: boolean;
+    }): Promise<Static<typeof VideoLeaseResponse>> {
+        const video = await this.settings();
+        if (!video.configured) throw new Err(400, null, 'Media Integration is not configured');
+
+        let lease = await this.config.models.VideoLease.from(leaseid);
+
+        if (opts.admin) {
+            lease = await this.config.models.VideoLease.commit(leaseid, {
+                ...body,
+                expiration: body.duration ? moment().add(body.duration, 'seconds').toISOString() : lease.expiration,
+            });
+        } else if (lease.username === opts.username) {
+            lease = await this.config.models.VideoLease.commit(leaseid, {
+                ...body,
+                expiration: body.duration ? moment().add(body.duration, 'seconds').toISOString() : lease.expiration,
+            });
+        } else {
+            throw new Err(400, null, 'You can only update a lease you created');
+        }
+
+        try {
+            await this.path(lease.path);
+        } catch (err) {
+            if (err instanceof Err && err.status === 404) {
+                const url = new URL(`/v3/config/paths/add/${lease.path}`, video.url);
+                url.port = '9997';
+
+                const headers = this.headers(video.username, video.password);
+                headers.append('Content-Type', 'application/json');
+
+                const res = await fetch(url, {
+                    method: 'POST',
+                    headers,
+                    body: JSON.stringify({
+                        name: lease.path
+                    }),
+                })
+
+                if (!res.ok) throw new Err(500, null, await res.text())
+            } else {
+                throw err;
+            }
+        }
+
+
+        return lease;
+    }
+
     async path(pathid: string): Promise<Static<typeof PathConfig>> {
         const video = await this.settings();
         if (!video.configured) throw new Err(400, null, 'Media Integration is not configured');
@@ -363,7 +414,11 @@ export default class VideoServiceControl {
             headers,
         });
 
-        return await res.typed(PathConfig);
+        if (res.ok) {
+            return await res.typed(PathConfig);
+        } else {
+            throw new Err(res.status, new Error(await res.text()), 'Media Server Error');
+        }
     }
 
     async delete(leaseid: string): Promise<void> {

diff --git a/api/routes/video-lease.ts b/api/routes/video-lease.ts
@@ -165,23 +165,10 @@ export default async function router(schema: Schema, config: Config) {
                 throw new Err(400, null, 'Only Administrators can request a lease > 16 hours')
             }
 
-            let lease = await config.models.VideoLease.from(req.params.lease);
-
-            if (user.access === AuthUserAccess.ADMIN) {
-                lease = await config.models.VideoLease.commit(req.params.lease, {
-                    ...req.body,
-                    expiration: req.body.duration ? moment().add(req.body.duration, 'seconds').toISOString() : lease.expiration,
-                });
-            } else {
-                if (lease.username === user.email) {
-                    lease = await config.models.VideoLease.commit(req.params.lease, {
-                        ...req.body,
-                        expiration: req.body.duration ? moment().add(req.body.duration, 'seconds').toISOString() : lease.expiration,
-                    });
-                } else {
-                    throw new Err(400, null, 'You can only update a lease you created');
-                }
-            }
+            const lease = await videoControl.commit(req.params.lease, req.body, {
+                username: user.email,
+                admin: user.access === AuthUserAccess.ADMIN
+            });
 
             res.json({
                 lease,