@vunk/plus 1.3.1 → 1.3.4

package/components/broadcasting-markdown/index.mjs

@@ -1,18 +1,18 @@
 import { VkTypingMarkdown } from '@vunk/plus/components/typing-markdown';
 import { setData } from '@vunk/core';
 import { defineComponent, createElementBlock, openBlock, createElementVNode, Fragment, createVNode, unref, withCtx, computed, onBeforeUnmount, onMounted, watch, shallowRef, nextTick, renderSlot, createCommentVNode, ref, watchEffect, resolveComponent, renderList, createBlock } from 'vue';
-import markdownIt from 'markdown-it';
 import { useDeferred } from '@vunk/core/composables';
 import { ElIcon } from 'element-plus';
 import { noop } from '@vunk/shared/function';
 import { Deferred } from '@vunk/shared/promise';
+import { c as consola } from '../browser.mjs';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
-const md = markdownIt();
+function markdownToPlainText(md) {
+  return md.replace(/!\[.*?\]\(.*?\)/g, "").replace(/\[([^\]]+)\]\([^)]+\)/g, "$1").replace(/^#{1,6}\s+/gm, "").replace(/\*\*(.*?)\*\*/g, "$1").replace(/__(.*?)__/g, "$1").replace(/\*(.*?)\*/g, "$1").replace(/_(.*?)_/g, "$1").replace(/`(.*?)`/g, "$1").replace(/```[\s\S]*?```/g, "").replace(/\n{2,}/g, "\n").replace(/-{3,}/g, "").replace(/^\s*-\s+/gm, "").replace(/\|/g, "").trim();
+}
 function defaultRender(mdText) {
-  const html = md.render(mdText);
-  const doc = new DOMParser().parseFromString(html, "text/html");
-  return doc.body.textContent || "";
+  return markdownToPlainText(mdText);
 }
 var ParagraphStatus = /* @__PURE__ */ ((ParagraphStatus2) => {
   ParagraphStatus2["initial"] = "initial";
@@ -32,6 +32,13 @@ var Broadcast = /* @__PURE__ */ ((Broadcast2) => {
 })(Broadcast || {});
 
 const props = {
+  /**
+   * @description md文本转纯文本的函数
+   */
+  render: {
+    type: Function,
+    default: defaultRender
+  },
   /**
    *  @description 段落详情
    */
@@ -178,10 +185,14 @@ var _sfc_main$3 = /* @__PURE__ */ defineComponent({
     url: {
       type: String,
       default: ""
+    },
+    render: {
+      type: Function,
+      required: true
     }
   },
   setup(props) {
-    const value = defaultRender(props.data.value).replace(/\n/g, "");
+    const value = props.render(props.data.value);
     const theData = computed(() => props.data);
     if (!value.trim()) {
       props.deferred.resolve(true);
@@ -260,6 +271,10 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
     processing: {
       type: Function,
       default: noop
+    },
+    retryTimes: {
+      type: Number,
+      default: 10
     }
   },
   emits: ["update:status"],
@@ -267,6 +282,7 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const theDef = shallowRef();
+    let retryTimes = props.retryTimes;
     const processingDef = useDeferred();
     onMounted(async () => {
       emit("update:status", ParagraphStatus.processing);
@@ -289,8 +305,15 @@ var _sfc_main$2 = /* @__PURE__ */ defineComponent({
       emit("update:status", ParagraphStatus.pending);
       deferred.promise.then(() => {
         emit("update:status", ParagraphStatus.fulfilled);
-      }).catch((err) => {
-        console.error(err);
+      }).catch(async (err) => {
+        consola.error("error", err);
+        if (retryTimes > 0) {
+          retryTimes--;
+          await props.processing?.();
+          consola.info("retryTimes", retryTimes);
+          init();
+          return;
+        }
         emit("update:status", ParagraphStatus.rejected);
       });
       theDef.value = void 0;
@@ -327,13 +350,15 @@ var _sfc_main$1 = /* @__PURE__ */ defineComponent({
     pause: {
       type: Boolean,
       default: false
+    },
+    render: {
+      type: Function,
+      required: true
     }
   },
   setup(props) {
-    const value = defaultRender(props.data.value).replace(/\n/g, "");
-    const theData = computed(() => {
-      return props.data;
-    });
+    const value = props.render(props.data.value);
+    const theData = computed(() => props.data);
     if (!value.trim()) {
       props.deferred.resolve(true);
       theData.value.broadcast = Broadcast.ended;
@@ -415,7 +440,10 @@ var _sfc_main = defineComponent({
       if (!props2.textToSpeech) {
         return;
       }
-      const value = defaultRender(paragraph.value);
+      const value = props2.render(paragraph.value);
+      if (!value) {
+        return;
+      }
       return props2.textToSpeech(`${value}`).then((url) => {
         paragraph.url = url;
       });
@@ -597,19 +625,20 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 data: item,
                 deferred
               }, () => [
-                item.url ? (openBlock(), createBlock(_component_CustomSpeechView, {
-                  key: 0,
+                createVNode(_component_CustomSpeechView, {
+                  render: _ctx.render,
                   url: item.url,
                   pause: _ctx.pause,
                   deferred,
                   data: item
-                }, null, 8, ["url", "pause", "deferred", "data"])) : createCommentVNode("v-if", true),
+                }, null, 8, ["render", "url", "pause", "deferred", "data"]),
                 _ctx.webSpeech ? (openBlock(), createBlock(_component_WebSpeechView, {
-                  key: 1,
+                  key: 0,
+                  render: _ctx.render,
                   pause: _ctx.pause,
                   deferred,
                   data: item
-                }, null, 8, ["pause", "deferred", "data"])) : createCommentVNode("v-if", true)
+                }, null, 8, ["render", "pause", "deferred", "data"])) : createCommentVNode("v-if", true)
               ])
             ]),
             _: 2

package/components/broadcasting-markdown/src/ctx.d.ts

@@ -1,7 +1,15 @@
 import type { SetDataEvent } from '@vunk/core';
 import type { PropType } from 'vue';
 import type { Paragraph, TextToSpeech } from './types';
+import { defaultRender } from './const';
 export declare const props: {
+    /**
+     * @description md文本转纯文本的函数
+     */
+    render: {
+        type: PropType<(text: string) => string>;
+        default: typeof defaultRender;
+    };
     /**
      *  @description 段落详情
      */

package/components/broadcasting-markdown/src/custom-speech.vue.d.ts

@@ -1,6 +1,6 @@
+import type { Deferred } from '@vunk/shared/promise';
 import type { PropType } from 'vue';
 import type { Paragraph } from './types';
-import { type Deferred } from '@vunk/shared/promise';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     data: {
         type: PropType<Paragraph>;
@@ -21,6 +21,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: StringConstructor;
         default: string;
     };
+    render: {
+        type: PropType<(text: string) => string>;
+        required: true;
+    };
 }>, (() => null) | (() => JSX.Element), {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     data: {
         type: PropType<Paragraph>;
@@ -41,6 +45,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: StringConstructor;
         default: string;
     };
+    render: {
+        type: PropType<(text: string) => string>;
+        required: true;
+    };
 }>> & Readonly<{}>, {
     pause: boolean;
     data: Paragraph;

package/components/broadcasting-markdown/src/index.vue.d.ts

@@ -3,6 +3,10 @@ import type { Ref } from 'vue';
 import type { Paragraph } from './types';
 import { ParagraphStatus } from './const';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    render: {
+        type: import("vue").PropType<(text: string) => string>;
+        default: typeof import("./const").defaultRender;
+    };
     data: {
         type: {
             (arrayLength: number): Paragraph[];
@@ -74,6 +78,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     'update:completed': (_: boolean) => boolean;
     'update:error': (_: boolean) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    render: {
+        type: import("vue").PropType<(text: string) => string>;
+        default: typeof import("./const").defaultRender;
+    };
     data: {
         type: {
             (arrayLength: number): Paragraph[];
@@ -141,6 +149,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     source: string;
     delay: number;
     pause: boolean;
+    render: (text: string) => string;
     data: Paragraph[];
     separators: string[];
     keepRead: boolean;
@@ -164,6 +173,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: import("vue").PropType<import("@vunk/shared").AnyFunc>;
             default: import("@vunk/shared").AnyFunc;
         };
+        retryTimes: {
+            type: NumberConstructor;
+            default: number;
+        };
     }>, {
         props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             enable: {
@@ -182,11 +195,16 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
                 type: import("vue").PropType<import("@vunk/shared").AnyFunc>;
                 default: import("@vunk/shared").AnyFunc;
             };
+            retryTimes: {
+                type: NumberConstructor;
+                default: number;
+            };
         }>> & Readonly<{
             "onUpdate:status"?: ((...args: any[]) => any) | undefined;
         }> & {}>;
         emit: (event: "update:status", ...args: any[]) => void;
         theDef: import("vue").ShallowRef<import("@vunk/shared/promise").Deferred<any> | undefined, import("@vunk/shared/promise").Deferred<any> | undefined>;
+        retryTimes: number;
         processingDef: {
             _ref: import("vue").ShallowRef<unknown, unknown>;
             readonly value: unknown;
@@ -212,6 +230,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: import("vue").PropType<import("@vunk/shared").AnyFunc>;
             default: import("@vunk/shared").AnyFunc;
         };
+        retryTimes: {
+            type: NumberConstructor;
+            default: number;
+        };
     }>> & Readonly<{
         "onUpdate:status"?: ((...args: any[]) => any) | undefined;
     }>, {
@@ -219,6 +241,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         pause: boolean;
         enable: boolean;
         status: ParagraphStatus;
+        retryTimes: number;
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     VkTypingMarkdown: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         source: {
@@ -293,6 +316,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: BooleanConstructor;
             default: boolean;
         };
+        render: {
+            type: import("vue").PropType<(text: string) => string>;
+            required: true;
+        };
     }>, (() => null) | (() => false | JSX.Element), {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         voice: {
             type: import("vue").PropType<SpeechSynthesisVoice>;
@@ -310,6 +337,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: BooleanConstructor;
             default: boolean;
         };
+        render: {
+            type: import("vue").PropType<(text: string) => string>;
+            required: true;
+        };
     }>> & Readonly<{}>, {
         pause: boolean;
         data: Paragraph;
@@ -391,6 +422,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: StringConstructor;
             default: string;
         };
+        render: {
+            type: import("vue").PropType<(text: string) => string>;
+            required: true;
+        };
     }>, (() => null) | (() => JSX.Element), {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
         data: {
             type: import("vue").PropType<Paragraph>;
@@ -408,6 +443,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: StringConstructor;
             default: string;
         };
+        render: {
+            type: import("vue").PropType<(text: string) => string>;
+            required: true;
+        };
     }>> & Readonly<{}>, {
         pause: boolean;
         data: Paragraph;

package/components/broadcasting-markdown/src/paragraph.vue.d.ts

@@ -19,6 +19,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<AnyFunc>;
         default: AnyFunc;
     };
+    retryTimes: {
+        type: NumberConstructor;
+        default: number;
+    };
 }>, {
     props: import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         enable: {
@@ -37,11 +41,16 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             type: PropType<AnyFunc>;
             default: AnyFunc;
         };
+        retryTimes: {
+            type: NumberConstructor;
+            default: number;
+        };
     }>> & Readonly<{
         "onUpdate:status"?: ((...args: any[]) => any) | undefined;
     }> & {}>;
     emit: (event: "update:status", ...args: any[]) => void;
     theDef: import("vue").ShallowRef<Deferred<any> | undefined, Deferred<any> | undefined>;
+    retryTimes: number;
     processingDef: {
         _ref: import("vue").ShallowRef<unknown, unknown>;
         readonly value: unknown;
@@ -67,6 +76,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<AnyFunc>;
         default: AnyFunc;
     };
+    retryTimes: {
+        type: NumberConstructor;
+        default: number;
+    };
 }>> & Readonly<{
     "onUpdate:status"?: ((...args: any[]) => any) | undefined;
 }>, {
@@ -74,5 +87,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     pause: boolean;
     enable: boolean;
     status: ParagraphStatus;
+    retryTimes: number;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/components/broadcasting-markdown/src/web-speech.vue.d.ts

@@ -18,6 +18,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    render: {
+        type: PropType<(text: string) => string>;
+        required: true;
+    };
 }>, (() => null) | (() => false | JSX.Element), {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     voice: {
         type: PropType<SpeechSynthesisVoice>;
@@ -35,6 +39,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    render: {
+        type: PropType<(text: string) => string>;
+        required: true;
+    };
 }>> & Readonly<{}>, {
     pause: boolean;
     data: Paragraph;