openvibers/openvibe.mediahub Commits

openvibe-shared v4.7.0, and openvibe.video plays videos in the network's player (#101)

OP OpenVibers committed 24 days ago · 5d4731e0a0 · 8 files, +20 −12

* openvibe-shared v4.7.0 (was v4.5.0)

Opened by scripts/pin-bump.js in OpenVibers/OpenVibe.Shared after the v4.7.0 release.

* openvibe.video plays recordings, clips and uploads in the network's player (openvibe-shared 4.7.0 player.js/css) instead of the browser's controls

Changes

ddiff --git a/README.md b/README.md
iindex d44805d..239f9b7 100644
---- a/README.md
++++ b/README.md
@@@ -523,5 +523,5 @@ Part of the [OpenVibe network](https://openvibe.network). Built in the open by [
  <!-- versions:start -->
  - openvibe-contracts: v0.200.0
  - openvibe-sdk: v0.50.1
--- openvibe-shared: v4.5.0
++- openvibe-shared: v4.7.0
  <!-- versions:end -->
ddiff --git a/STATUS.json b/STATUS.json
iindex f67d356..9f0e389 100644
---- a/STATUS.json
++++ b/STATUS.json
@@@ -10,7 +10,7 @@
    "packages": [
      "openvibe-contracts v0.200.0",
      "openvibe-sdk v0.50.1",
--    "openvibe-shared v4.5.0"
++    "openvibe-shared v4.7.0"
    ],
    "summary": "OpenVibe.MediaHub: openvibe.download as a private drive. Account-only uploads stream into OpenVibe.Media (a plain form up to 256 MB, resumable parts beyond). Files are private. Share links expire in 1 hour to 7 days, need a signed-in downloader and can be limited to named accounts (matched by subject). Reports suspend a share for staff. Downloads are always sandboxed attachments. Per-person quotas, and account export and deletion (ADR-033). openvibe.video serves public watch pages and playlists for Live's recordings and clips (no uploads); openvibe.pics is parked and redirects to openvibe.network.",
    "works": [
@@@ -45,7 +45,7 @@
    ],
    "contracts": "openvibe-contracts v0.200.0",
    "sdk": "openvibe-sdk v0.50.1",
--  "shared": "openvibe-shared v4.5.0",
++  "shared": "openvibe-shared v4.7.0",
    "deployment": "openvibe-ovh: unit openvibe-media-hub.service on 127.0.0.1:4990 (git checkout /opt/openvibe.download, env /etc/openvibe/media-hub.env, database ov_media_hub), deployed with `sudo ovhost deploy media-hub`; public at https://openvibe.download since 2026-10-08 and https://openvibe.video since 2026-10-12.",
    "updated": "2026-10-20"
  }
ddiff --git a/package-lock.json b/package-lock.json
iindex ad0197b..a8762bb 100644
---- a/package-lock.json
++++ b/package-lock.json
@@@ -17,7 +17,7 @@
          "iovalkey": "^0.4.0",
          "openvibe-contracts": "https://codeload.github.com/OpenVibers/OpenVibe.Contracts/tar.gz/refs/tags/v0.200.0",
          "openvibe-sdk": "https://codeload.github.com/OpenVibers/OpenVibe.SDK/tar.gz/refs/tags/v0.50.1",
--        "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.5.0",
++        "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.7.0",
          "pg": "^8.23.0",
          "sharp": "^0.33.5"
        },
@@@ -1379,9 +1379,9 @@
        }
      },
      "node_modules/openvibe-shared": {
--      "version": "4.5.0",
--      "resolved": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.5.0",
--      "integrity": "sha512-HUEDETiz1l4zbjijr+yov7rQdCU1HV2VLT+JD2UZZeHcR5h9+bQpR7GXUixxeEwY3bznqCmW6l0c61NLEfYVLg==",
++      "version": "4.7.0",
++      "resolved": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.7.0",
++      "integrity": "sha512-oobo+p+UH7ImewGliZOloJ0lSSNP7NXxCejWLYtq93cT0BwvOs0hRxkOdSb91S4CRQ1cJUiGuXlhGh2M9injsQ==",
        "license": "MIT",
        "dependencies": {
          "jsonwebtoken": "^9.0.0"
ddiff --git a/package.json b/package.json
iindex a223b7e..a8b358c 100644
---- a/package.json
++++ b/package.json
@@@ -24,7 +24,7 @@
      "iovalkey": "^0.4.0",
      "openvibe-contracts": "https://codeload.github.com/OpenVibers/OpenVibe.Contracts/tar.gz/refs/tags/v0.200.0",
      "openvibe-sdk": "https://codeload.github.com/OpenVibers/OpenVibe.SDK/tar.gz/refs/tags/v0.50.1",
--    "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.5.0",
++    "openvibe-shared": "https://codeload.github.com/OpenVibers/OpenVibe.Shared/tar.gz/refs/tags/v4.7.0",
      "pg": "^8.23.0",
      "sharp": "^0.33.5"
    },
ddiff --git a/server/video/layout.js b/server/video/layout.js
iindex 4af18cd..05841a9 100644
---- a/server/video/layout.js
++++ b/server/video/layout.js
@@@ -13,6 +13,7 @@ const crypto = require('crypto');
  const fs = require('fs');
  const path = require('path');
  const appIcon = require('openvibe-shared/app-icon');
++const ovServe = require('openvibe-shared/serve');
  const shell = require('openvibe-shared/shell');
  const cache = require('openvibe-shared/cache-policy');
  const { html, raw, esc, render } = require('../render/html');
@@@ -33,6 +34,7 @@ function assetVersion(rel) {
  const asset = (rel) => `/${rel}?v=${assetVersion(rel)}`;
  
  /** o: title, description, body (html), config, path, index, noindex, viewer, private, crumbs [{label, href}], scripts [rel],
++ *     player (true: the network's video player, openvibe-shared player.js/css, on video[data-ov-player]),
   *     jsonLd (structured data for the page), image (its share image, an https URL), ogType */
  function renderPage(o) {
      // The front page's title says what the site is (search results show it; at most 60 characters).
@@@ -49,7 +51,7 @@ ${appIcon.headTags({ site: 'media-hub' })}
  <link rel="stylesheet" href="${asset('css/app.css')}">
  <link rel="stylesheet" href="${asset('css/video.css')}">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" crossorigin="anonymous" referrerpolicy="no-referrer">
--${(o.scripts || []).map((rel) => `<script src="${asset(rel)}" defer></script>`).join('\n')}`;
++${o.player ? `<link rel="stylesheet" href="${ovServe.url('player.css')}">\n<script src="${ovServe.url('player.js')}" defer></script>\n` : ''}${(o.scripts || []).map((rel) => `<script src="${asset(rel)}" defer></script>`).join('\n')}`;
      const account = signedIn
          ? html`Signed in as <strong>${viewer.displayName || viewer.username || 'you'}</strong> · <a href="/auth/logout?next=${encodeURIComponent(pathNow)}">Sign out</a>`
          : html`<a href="/auth/login?next=${encodeURIComponent(pathNow)}">Sign in with OpenVibe</a>`;
ddiff --git a/server/video/pages.js b/server/video/pages.js
iindex 2c5e46e..8e6a0ad 100644
---- a/server/video/pages.js
++++ b/server/video/pages.js
@@@ -870,10 +870,11 @@ ${uploaded.length ? html`<section class="ovv-section" aria-labelledby="h-uploads
                  image: httpsUrl(vod.thumbnail_url) || undefined, ogType: 'video.other',
              }),
              scripts: ['js/video.js'],
++            player: true,
              body: html`<div class="ovv-watch">
  <div class="ovv-main">
  ${savedNotice(req)}${ownOnly ? notice('Private: only you (and OpenVibe staff) can see this recording.', 'info') : ''}
--<div class="ovv-player-wrap"><video class="ovv-player" controls preload="metadata" playsinline${posterAttr(httpsUrl(vod.thumbnail_url))} src="${fileOf(vod) || ''}" data-ovv-video${nextAttr}${viewAttr}${hlsAttr}>${segs.length ? html`<track kind="captions" label="Transcript (AI)" src="/v/${id}/captions.vtt" default>` : ''}${mems.length ? html`<track kind="chapters" src="/v/${id}/chapters.vtt">` : ''}</video></div>
++<div class="ovv-player-wrap"><video class="ovv-player" data-ov-player controls preload="metadata" playsinline${posterAttr(httpsUrl(vod.thumbnail_url))} src="${fileOf(vod) || ''}" data-ovv-video${nextAttr}${viewAttr}${hlsAttr}>${segs.length ? html`<track kind="captions" label="Transcript (AI)" src="/v/${id}/captions.vtt" default>` : ''}${mems.length ? html`<track kind="chapters" src="/v/${id}/chapters.vtt">` : ''}</video></div>
  <h1 class="ovv-title">${vod.title || 'Stream recording'}</h1>
  <div class="ovv-byline">
  ${channelName ? html`<a class="ovv-avatar" href="${localChannel || liveChannel}" aria-hidden="true" tabindex="-1">${String(channelName).slice(0, 1).toUpperCase()}${live.isUsername(String(vod.username || '')) ? html`<img src="${config.networkUrl}/avatar/${vod.username}" alt="" loading="lazy">` : ''}</a>` : ''}
@@@ -948,11 +949,12 @@ ${clips.length ? html`<section class="ovv-panel" aria-labelledby="h-clips"><h2 i
                  image: httpsUrl(clip.thumbnail_url) || undefined, ogType: 'video.other',
              }),
              scripts: ['js/video.js'],
++            player: true,
              body: html`<div class="ovv-watch ovv-watch--clip">
  <div class="ovv-main">
  ${savedNotice(req)}${req.query.made === '1' ? notice('Your clip was made. It is credited to you on OpenVibe.Live and here.', 'ok') : ''}${ownOnly ? notice('Private: only you (and OpenVibe staff) can see this clip.', 'info') : ''}
  ${cutting ? html`<div class="ovv-player-wrap ovv-cutting" role="status" data-ovv-reload="8"><p><i class="fa-solid fa-scissors" aria-hidden="true"></i> This clip is being cut. It plays here in a moment; the page checks again by itself.</p></div>`
--        : html`<div class="ovv-player-wrap"><video class="ovv-player" controls preload="metadata" playsinline${posterAttr(httpsUrl(clip.thumbnail_url))} src="${fileOf(clip) || ''}" data-ovv-video${nextAttr}${viewAttr}${hlsAttr}></video></div>`}
++        : html`<div class="ovv-player-wrap"><video class="ovv-player" data-ov-player controls preload="metadata" playsinline${posterAttr(httpsUrl(clip.thumbnail_url))} src="${fileOf(clip) || ''}" data-ovv-video${nextAttr}${viewAttr}${hlsAttr}></video></div>`}
  <h1 class="ovv-title">${clip.title || 'Clip'}</h1>
  <div class="ovv-byline">
  <div class="ovv-byline-text"><span class="ovv-channel-name">${clip.auto_generated ? html`<span class="ovv-tag ovv-tag--inline">AI clip</span> ` : ''}${attribution}</span>
ddiff --git a/server/video/upload-routes.js b/server/video/upload-routes.js
iindex ee39b30..a679419 100644
---- a/server/video/upload-routes.js
++++ b/server/video/upload-routes.js
@@@ -265,13 +265,14 @@ ${fresh.map((x) => html`<tr><td><a href="/u/${x.id}">${x.title}</a></td><td>${st
              description: row.description ? row.description.slice(0, 300) : `A video by @${channel || 'someone'} on OpenVibe.Video.`,
              ...(listed && thumb ? { image: thumb, ogType: 'video.other' } : {}),
              scripts: ready ? ['js/video.js'] : [],
++            player: !!(ready && vod),
              body: html`<div class="ovv-watch">
  <div class="ovv-main">
  ${req.query.saved === '1' ? notice('Saved.', 'ok') : ''}${req.query.reported === '1' ? notice('Thanks: the report reached OpenVibe staff.', 'ok') : ''}
  ${row.state === 'hidden' ? notice('Hidden after reports: only you and OpenVibe staff can see it until staff decide.', 'warn') : ''}
  ${row.visibility === 'private' && ready ? notice('Private: only you (and OpenVibe staff) can see this video.', 'info') : ''}
  ${original && original.state !== 'removed' ? html`<p class="ovv-fine ovv-edited-from">An edited copy of <a href="/u/${original.id}">${original.title}</a>, made by the AI cut.</p>` : ''}
--${ready && vod ? html`<div class="ovv-player-wrap"><video class="ovv-player" controls preload="metadata" playsinline${thumb ? html` poster="${`${thumb}?w=1280&fmt=webp`}"` : ''} src="${fileOf(vod) || ''}" data-ovv-video${nextAttr}${hlsAttrs(vod)}>${tracks}</video></div>`
++${ready && vod ? html`<div class="ovv-player-wrap"><video class="ovv-player" data-ov-player controls preload="metadata" playsinline${thumb ? html` poster="${`${thumb}?w=1280&fmt=webp`}"` : ''} src="${fileOf(vod) || ''}" data-ovv-video${nextAttr}${hlsAttrs(vod)}>${tracks}</video></div>`
          : html`<div class="ovv-player-wrap ovv-processing" role="status">${row.status === 'processing' ? html`<p><i class="fa-solid fa-gear fa-spin" aria-hidden="true"></i> Processing: OpenVibe.Media is making it playable. This page reloads by itself.</p>`
              : row.status === 'failed' ? html`<p>This upload could not be processed. ${row.error || ''}</p>`
                  : html`<p>The upload stopped before the end (${row.parts_received} of ${row.parts_expected} parts). Upload the file again from <a href="/upload">Upload</a>.</p>`}</div>`}
ddiff --git a/test/video-pages.test.js b/test/video-pages.test.js
iindex 393c9a8..b4681c3 100644
---- a/test/video-pages.test.js
++++ b/test/video-pages.test.js
@@@ -266,6 +266,9 @@ function countOccurrences(haystack, needle) {
          assert.ok(r.text.includes('preload="metadata"'));
          assert.ok(r.text.includes('playsinline'));
          assert.ok(r.text.includes('data-ovv-video'));
++        // The network's player (openvibe-shared player.js/css): marked, and both files load on the page.
++        assert.ok(/<video class="ovv-player" data-ov-player controls /.test(r.text), 'the video takes the network player');
++        assert.ok(/<link rel="stylesheet" href="\/shared\/player\.css\?v=[0-9a-f]+">/.test(r.text) && /<script src="\/shared\/player\.js\?v=[0-9a-f]+" defer><\/script>/.test(r.text), 'player.css and player.js load');
          assert.ok(r.text.includes('data-ovv-view="https://openvibe.live/api/views/vod/101"'), 'playback counts a view on Live');
          const ld = [...r.text.matchAll(/<script type="application\/ld\+json">([\s\S]*?)<\/script>/g)].map((m) => JSON.parse(m[1])).find((x) => x['@type'] === 'VideoObject');
          assert.ok(ld, 'a VideoObject');