@diplodoc/transform 4.34.2-beta1 → 4.35.0-beta2

package/src/transform/plugins/video/parsers.ts

@@ -1,4 +1,4 @@
-import {VideoService} from './const';
+import {Services} from './const';
 
 const ytRegex = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/;
 export function youtubeParser(url: string) {
@@ -39,45 +39,80 @@ export function yandexParser(url: string) {
     return match ? match[1] : url;
 }
 
-const vkRegex = /^https:\/\/vk.com\/video_ext\.php?(oid=[-\d]+&id=[-\d]+)/;
+const vkRegex = /^https:\/\/vk\.com\/video_ext\.php\?(oid=[-\d]+&id=[-\d]+)/;
 export function vkParser(url: string) {
     const match = url.match(vkRegex);
     return match ? match[1] : url;
 }
 
-export function parseVideoUrl(service: string, url: string): string | false {
+const rutubeRegex = /^https:\/\/rutube\.ru\/video\/([a-zA-Z0-9]+)\/?/;
+export function rutubeParser(url: string) {
+    const match = url.match(rutubeRegex);
+    return match ? match[1] : url;
+}
+
+const dzenRegex = /^https:\/\/dzen\.ru\/video\/watch\/([a-zA-Z0-9]+)/;
+export function dzenParser(url: string) {
+    const match = url.match(dzenRegex);
+    return match ? match[1] : url;
+}
+
+const supportedServices = Object.entries({
+    osf: {
+        extract: mfrParser,
+    },
+    prezi: {
+        extract: preziParser,
+    },
+    vimeo: {
+        extract: vimeoParser,
+    },
+    vine: {
+        extract: vineParser,
+    },
+    yandex: {
+        extract: yandexParser,
+    },
+    youtube: {
+        extract: youtubeParser,
+    },
+    vk: {
+        extract: vkParser,
+        csp: {
+            'frame-src': 'https://vk.com/',
+        },
+    },
+    rutube: {
+        extract: rutubeParser,
+        csp: {
+            'frame-src': 'https://rutube.ru/play/embed/',
+        },
+    },
+    dzen: {
+        extract: dzenParser,
+        csp: {
+            'frame-src': 'https://dzen.ru/embed/',
+        },
+    },
+}) as Services;
+
+export function parseVideoUrl(service: string, url: string) {
     let videoID = '';
+    const normalizedService = service.toLowerCase();
+    const parsed = supportedServices.find(([name]) => name === normalizedService);
 
-    switch (service.toLowerCase()) {
-        case VideoService.YouTube:
-            videoID = youtubeParser(url);
-            break;
-        case VideoService.Vimeo:
-            videoID = vimeoParser(url);
-            break;
-        case VideoService.Vine:
-            videoID = vineParser(url);
-            break;
-        case VideoService.Prezi:
-            videoID = preziParser(url);
-            break;
-        case VideoService.Osf:
-            videoID = mfrParser(url);
-            break;
-        case VideoService.Yandex:
-            videoID = yandexParser(url);
-            break;
-        case VideoService.Vk:
-            videoID = vkParser(url);
-            break;
-        default:
-            return false;
+    if (!parsed) {
+        return false;
     }
 
+    const [, videoParser] = parsed;
+
+    videoID = videoParser.extract(url);
+
     // If the videoID field is empty, regex currently make it the close parenthesis.
     if (videoID === ')') {
         videoID = '';
     }
 
-    return videoID;
+    return [videoID, videoParser.csp] as const;
 }

package/src/transform/plugins/video/types.ts

@@ -7,13 +7,14 @@ export type VideoToken = Token & {
 };
 
 export type VideoServicesOptions = {
-    [VideoService.YouTube]: {width: number; height: number};
-    [VideoService.Vimeo]: {width: number; height: number};
-    [VideoService.Vine]: {width: number; height: number; embed: 'simple' | string};
-    [VideoService.Prezi]: {width: number; height: number};
-    [VideoService.Osf]: {width: string; height: string};
-    [VideoService.Yandex]: {width: number; height: number};
-    [VideoService.Vk]: {width: number; height: number};
+    [service in VideoService]: {
+        width: number | string;
+        height: number | string;
+    };
+} & {
+    vine: {
+        embed: 'simple' | (string & {});
+    };
 };
 
 export type VideoFullOptions = VideoServicesOptions & {

package/src/transform/plugins/video/utils.ts

@@ -18,9 +18,13 @@ export const videoUrl: VideoUrlFn = (service, videoID, options) => {
         case 'osf':
             return `https://mfr.osf.io/render?url=https://osf.io/${videoID}/?action=download`;
         case 'yandex':
-            return `https://runtime.video.cloud.yandex.net/player/${videoID}`;
+            return `https://runtime.video.cloud.yandex.net/player/video/${videoID}`;
         case 'vk':
             return `https://vk.com/video_ext.php?${videoID}`;
+        case 'rutube':
+            return `https://rutube.ru/play/embed/${videoID}`;
+        case 'dzen':
+            return `https://dzen.ru/video/embed/${videoID}`;
         default:
             return service;
     }

package/src/transform/preprocessors/included/index.ts

@@ -74,7 +74,7 @@ const index: MarkdownItPreprocessorCb<{
 
     // To reduce file reading we can include the file content into the generated content
     if (included) {
-        const lines = input.split('\n') || [];
+        const lines = input?.split('\n') || [];
 
         // The finction reads the files from bottom to top(!). It stops the loop if it does not have anything to swap.
         // If the function finds something to process then it restarts the loop because the position of the last element has been moved.