feat: save video meta (#324)

makeomatic · Apr 17, 2024 · ef8bbcf · ef8bbcf
1 parent 5890aba
commit ef8bbcf
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 14 deletions.
diff --git a/schemas/common.json b/schemas/common.json
@@ -757,6 +757,10 @@
               "type": "number"
             }
           ]
+        },
+        "^cfs:[0-9A-Fa-f]{32}$": {
+          "type": "string",
+          "maxLength": 8192
         }
       },
       "allOf": [

diff --git a/src/actions/cloudflare-stream.js b/src/actions/cloudflare-stream.js
@@ -1,5 +1,6 @@
 const { ActionTransport } = require('@microfleet/plugin-router');
 const { HttpStatusError } = require('common-errors');
+const stringify = require('safe-stable-stringify');
 
 const { PROVIDER_CLOUDFLARE_MISSING_ERROR } = require('../constant');
 const CloudflareStreamTransport = require('../providers/cloudflare-stream');
@@ -34,16 +35,35 @@ async function cloudflareWebhookAction(request) {
   const message = parseBodyJson(body);
   const { status, uid } = message;
 
-  if (status.state === STATUS_STATE_READY) {
-    await this.dispatch('finish', {
-      params: {
-        filename: CloudflareStreamTransport.filenameWithPrefix(uid),
-      },
-    });
-  } else {
+  if (status.state !== STATUS_STATE_READY) {
     this.log.error({ message }, 'failed cloudflare-stream webhook');
+
+    return RESPONSE_OK;
   }
 
+  const filename = CloudflareStreamTransport.filenameWithPrefix(uid);
+  const { uploadId, owner } = await this.dispatch('finish', {
+    params: {
+      filename,
+      await: true,
+    },
+  });
+
+  await this.dispatch('update', {
+    params: {
+      uploadId,
+      username: owner,
+      meta: {
+        [filename]: stringify({
+          duration: message.duration,
+          height: message.input.height,
+          size: message.size,
+          width: message.input.width,
+        }),
+      },
+    },
+  });
+
   return RESPONSE_OK;
 }
 

diff --git a/src/actions/update.js b/src/actions/update.js
@@ -273,5 +273,5 @@ function initFileUpdate({ params }) {
   return Promise.using(this.dlock.acquireLock(...keys), this, params, updateMeta);
 }
 
-initFileUpdate.transports = [ActionTransport.amqp];
+initFileUpdate.transports = [ActionTransport.amqp, ActionTransport.internal];
 module.exports = initFileUpdate;
diff --git a/src/custom/cappasity-info-post.js b/src/custom/cappasity-info-post.js
@@ -369,22 +369,30 @@ const GREEN_LIGHT_STATUSES = Object.setPrototypeOf({
   [STATUS_FAILED]: true,
 }, null);
 
-const setCloudflareStreamPreview = async (service, file) => {
+const setCloudflareStreamData = async (service, uploadData) => {
   const cloudflareStream = service.providersByAlias['cloudflare-stream'];
 
-  if (cloudflareStream && file?.preview?.startsWith('cfs:')) {
-    if (file[FILES_PUBLIC_FIELD]) {
-      file.preview = await cloudflareStream.getThumbnailUrl(file.preview);
+  if (cloudflareStream && uploadData?.preview?.startsWith('cfs:')) {
+    if (uploadData[FILES_PUBLIC_FIELD]) {
+      uploadData.preview = await cloudflareStream.getThumbnailUrl(uploadData.preview);
     } else {
-      file.preview = await cloudflareStream.getThumbnailUrlSigned(file.preview);
+      uploadData.preview = await cloudflareStream.getThumbnailUrlSigned(uploadData.preview);
+    }
+  }
+
+  for (const { filename } of uploadData.files) {
+    try {
+      uploadData[filename] = JSON.parse(uploadData[filename]);
+    } catch (error) {
+      service.log.error({ error, uploadData }, 'failed to parse cloudflare-stream meta');
     }
   }
 };
 
 // Actual code that populates .embed from predefined data
 module.exports = async function getEmbeddedInfo(file) {
   if (file.uploadType === UPLOAD_TYPE_CLOUDFLARE_STREAM) {
-    await setCloudflareStreamPreview(this, file);
+    await setCloudflareStreamData(this, file);
 
     return file;
   }

diff --git a/test/suites/upload.cloudflare-stream.js b/test/suites/upload.cloudflare-stream.js
@@ -241,6 +241,11 @@ const assertInfo = async (response, uploadId, filename, signedURLs = true) => {
   equal(response.file.files[0].type, 'video');
   equal(response.file.files[0].filename, filename);
 
+  equal(response.file[filename].duration, 5.5);
+  equal(response.file[filename].height, 320);
+  equal(response.file[filename].size, 383631);
+  equal(response.file[filename].width, 560);
+
   const { status, headers } = await fetch(response.file.preview);
 
   equal(status, 200);