@vunk/plus 1.3.9 → 1.3.11

package/components/agent-chat-provider/src/index.vue.d.ts

@@ -1,12 +1,12 @@
 import type { AnyFunc } from '@vunk/shared';
 import type { PropType } from 'vue';
-import type { AgentChatContext, AgentMessage, Parser } from './types';
+import type { AgentChatContext, AgentMessage } from './types';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     request: {
         type: PropType<AnyFunc>;
     };
     parser: {
-        type: PropType<Parser>;
+        type: PropType<AnyFunc>;
     };
 }>, import("vue").Slot<any> | undefined, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     load: (e: AgentChatContext) => {
@@ -27,7 +27,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<AnyFunc>;
     };
     parser: {
-        type: PropType<Parser>;
+        type: PropType<AnyFunc>;
     };
 }>> & Readonly<{
     onLoad?: ((e: {

package/components/agent-chat-provider/src/types.d.ts

@@ -19,10 +19,15 @@ export type AgentMessage = BubbleMessage & {
 export type BubbleMessage = Partial<BubbleListItemProps> & {
     role: string;
     content: string;
+    /**
+     * @description 服务端请求是否完成
+     */
     seviceEnd?: boolean;
     thinkingStatus?: 'start' | 'thinking' | 'end' | 'error';
     thinkingContent?: string;
     meta?: NormalObject;
+    abortController?: AbortController;
+    [key: string]: any;
 };
 export type BubbleItem = BubbleItemBasic & __VkBubbleTemplates.RenderItem;
 export type RoleMedia = RoleMediaBasic & __VkBubbleTemplates.RenderItem;

package/components/broadcasting-markdown/index.mjs

@@ -98,6 +98,7 @@ const props = {
 };
 const emits = {
   "setData": (e) => e,
+  "interrupt": null,
   "update:broadcasting": (_) => true,
   "update:completed": (_) => true,
   "update:error": (_) => true
@@ -3690,7 +3691,7 @@ var _sfc_main = defineComponent({
   },
   props,
   emits,
-  setup(props2, { emit }) {
+  setup(props2, { emit, expose }) {
     const _data = ref([]);
     const theData = computed(() => {
       return props2.data ?? _data.value;
@@ -3821,6 +3822,14 @@ var _sfc_main = defineComponent({
         }
       }
     }
+    const isInterrupted = ref(false);
+    const thePause = computed(() => {
+      return isInterrupted.value || props2.pause;
+    });
+    function interrupt() {
+      isInterrupted.value = true;
+      emit("interrupt");
+    }
     const isBroadcasting = computed(() => {
       return theData.value.some(
         (item) => item.broadcast === Broadcast.playing
@@ -3854,13 +3863,17 @@ var _sfc_main = defineComponent({
       const isPrevFulfilled = isPrevParagraphFulfilled(currentIndex2);
       return isPrevFulfilled;
     }
+    expose({
+      interrupt
+    });
     return {
       theData,
       ParagraphStatus,
       fulfilledTextValue,
       isPrevParagraphFulfilled,
       isParagraphEnabled,
-      processingParagraph
+      processingParagraph,
+      thePause
     };
   }
 });
@@ -3875,11 +3888,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     null,
     [
       renderSlot(_ctx.$slots, "default", { paragraphs: _ctx.theData }, () => [
-        createCommentVNode(' <ElButton @click="() => console.log(theData)">\n      log\n    </ElButton> '),
         createVNode(_component_VkTypingMarkdown, {
           source: _ctx.fulfilledTextValue,
           delay: 200,
-          pause: _ctx.pause
+          pause: _ctx.thePause
         }, null, 8, ["source", "pause"])
       ]),
       (openBlock(true), createElementBlock(
@@ -3901,14 +3913,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 createVNode(_component_HowlerSpeechView, {
                   render: _ctx.render,
                   url: item.url,
-                  pause: _ctx.pause,
+                  pause: _ctx.thePause,
                   deferred,
                   data: item
                 }, null, 8, ["render", "url", "pause", "deferred", "data"]),
                 _ctx.webSpeech ? (openBlock(), createBlock(_component_WebSpeechView, {
                   key: 0,
                   render: _ctx.render,
-                  pause: _ctx.pause,
+                  pause: _ctx.thePause,
                   deferred,
                   data: item
                 }, null, 8, ["render", "pause", "deferred", "data"])) : createCommentVNode("v-if", true)

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

@@ -95,6 +95,7 @@ export declare const props: {
 };
 export declare const emits: {
     setData: (e: SetDataEvent) => SetDataEvent;
+    interrupt: null;
     'update:broadcasting': (_: boolean) => boolean;
     'update:completed': (_: boolean) => boolean;
     'update:error': (_: boolean) => boolean;

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

@@ -72,8 +72,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     isPrevParagraphFulfilled: (currentIndex: number) => boolean;
     isParagraphEnabled: (currentIndex: number) => boolean;
     processingParagraph: (paragraph: Paragraph) => Promise<void> | undefined;
+    thePause: import("vue").ComputedRef<boolean>;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     setData: (e: SetDataEvent) => SetDataEvent;
+    interrupt: null;
     'update:broadcasting': (_: boolean) => boolean;
     'update:completed': (_: boolean) => boolean;
     'update:error': (_: boolean) => boolean;
@@ -142,6 +144,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     };
 }>> & Readonly<{
     onSetData?: ((e: SetDataEvent) => any) | undefined;
+    onInterrupt?: ((...args: any[]) => any) | undefined;
     "onUpdate:broadcasting"?: ((_: boolean) => any) | undefined;
     "onUpdate:completed"?: ((_: boolean) => any) | undefined;
     "onUpdate:error"?: ((_: boolean) => any) | undefined;

package/components/bubble-list/src/index.vue.d.ts

@@ -35,8 +35,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             default: () => string[];
         };
     }>, {
-        initRenderData: (emitSetData: any, props: any) => void;
-        typed: (e: import("./types").Item) => import("./types").Item;
+        setRef: (emitSetData: (e: import("@vunk/core").SetDataEvent) => void, props: import("./types").Item, el: any) => void;
+        initRenderData: (emitSetData: (e: import("@vunk/core").SetDataEvent) => void, props: import("./types").Item) => void;
         readonly VkBroadcastingMarkdown: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
             render: {
                 type: import("vue").PropType<(text: string) => string>;
@@ -107,8 +107,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isPrevParagraphFulfilled: (currentIndex: number) => boolean;
             isParagraphEnabled: (currentIndex: number) => boolean;
             processingParagraph: (paragraph: import("../../broadcasting-markdown/src/types").Paragraph) => Promise<void> | undefined;
+            thePause: import("vue").ComputedRef<boolean>;
         }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
             setData: (e: import("@vunk/core").SetDataEvent) => import("@vunk/core").SetDataEvent;
+            interrupt: null;
             'update:broadcasting': (_: boolean) => boolean;
             'update:completed': (_: boolean) => boolean;
             'update:error': (_: boolean) => boolean;
@@ -177,6 +179,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             };
         }>> & Readonly<{
             onSetData?: ((e: import("@vunk/core").SetDataEvent) => any) | undefined;
+            onInterrupt?: ((...args: any[]) => any) | undefined;
             "onUpdate:broadcasting"?: ((_: boolean) => any) | undefined;
             "onUpdate:completed"?: ((_: boolean) => any) | undefined;
             "onUpdate:error"?: ((_: boolean) => any) | undefined;

package/components/bubble-templates/index.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, Fragment, createVNode, unref, withCtx, createBlock, createCommentVNode } from 'vue';
+import { defineComponent, createElementBlock, openBlock, Fragment, createVNode, unref, withCtx, createBlock, createCommentVNode, markRaw } from 'vue';
 import { VkBroadcastingMarkdown } from '@vunk/plus/components/broadcasting-markdown';
 import { VkRendererTemplate } from '@vunk/core/components/renderer-template';
 import { Thinking, Typewriter } from 'vue-element-plus-x';
@@ -18,6 +18,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
+    function setRef(emitSetData, props, el) {
+      emitSetData?.({
+        k: [props.key, "elRef"],
+        v: markRaw(el)
+      });
+    }
     function initRenderData(emitSetData, props) {
       emitSetData?.({
         k: [props.key, "meta"],
@@ -25,7 +31,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       });
       emitSetData?.({
         k: [props.key, "templateType"],
-        v: "VkBroadcastingMarkdown"
+        v: props.templateType
       });
     }
     return (_ctx, _cache) => {
@@ -34,19 +40,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         null,
         [
           createVNode(unref(VkRendererTemplate), { type: "Typewriter" }, {
-            default: withCtx(({ props, emitSetData }) => [
+            default: withCtx(({ emitSetData, props }) => [
               props.thinkingContent && __props.modules?.includes("Thinking") ? (openBlock(), createBlock(unref(Thinking), {
                 key: 0,
                 content: props.thinkingContent,
                 status: props.thinkingStatus
               }, null, 8, ["content", "status"])) : createCommentVNode("v-if", true),
               createVNode(unref(Typewriter), {
+                ref: (el) => setRef(emitSetData, props, el),
                 content: props.content,
                 typing: props.typing,
                 "is-markdown": props.isMarkdown,
                 "is-fog": props.isFog,
-                onVnodeMounted: ($event) => initRenderData(emitSetData, props)
-              }, null, 8, ["content", "typing", "is-markdown", "is-fog", "onVnodeMounted"])
+                onVnodeMounted: ($event) => initRenderData(emitSetData, props),
+                onStart: () => emitSetData({
+                  k: [props.key, "completed"],
+                  v: false
+                }),
+                onFinish: () => emitSetData({
+                  k: [props.key, "completed"],
+                  v: true
+                })
+              }, null, 8, ["content", "typing", "is-markdown", "is-fog", "onVnodeMounted", "onStart", "onFinish"])
             ]),
             _: 1
             /* STABLE */
@@ -59,6 +74,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 status: props.thinkingStatus
               }, null, 8, ["content", "status"])) : createCommentVNode("v-if", true),
               createVNode(unref(VkBroadcastingMarkdown), {
+                ref: (el) => setRef(emitSetData, props, el),
                 source: props.content,
                 "keep-read": !props.seviceEnd,
                 "text-to-speech": __props.textToSpeech,

package/components/bubble-templates/src/index.vue.d.ts

@@ -1,7 +1,7 @@
-import type { __VkAgentChatProvider } from '@vunk/plus/components/agent-chat-provider';
 import type { __VkBroadcastingMarkdown } from '@vunk/plus/components/broadcasting-markdown';
 import type { __VkBubbleList } from '@vunk/plus/components/bubble-list';
-import type { PropType } from 'vue';
+import type { SetDataEvent } from '@vunk/core';
+import { type PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     textToSpeech: {
         type: PropType<__VkBroadcastingMarkdown.TextToSpeech>;
@@ -11,8 +11,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: () => string[];
     };
 }>, {
-    initRenderData: (emitSetData: any, props: any) => void;
-    typed: (e: __VkBubbleList.Item) => __VkAgentChatProvider.BubbleItem;
+    setRef: (emitSetData: (e: SetDataEvent) => void, props: __VkBubbleList.Item, el: any) => void;
+    initRenderData: (emitSetData: (e: SetDataEvent) => void, props: __VkBubbleList.Item) => void;
     readonly VkBroadcastingMarkdown: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         render: {
             type: PropType<(text: string) => string>;
@@ -83,8 +83,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         isPrevParagraphFulfilled: (currentIndex: number) => boolean;
         isParagraphEnabled: (currentIndex: number) => boolean;
         processingParagraph: (paragraph: __VkBroadcastingMarkdown.Paragraph) => Promise<void> | undefined;
+        thePause: import("vue").ComputedRef<boolean>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-        setData: (e: import("@vunk/core").SetDataEvent) => import("@vunk/core").SetDataEvent;
+        setData: (e: SetDataEvent) => SetDataEvent;
+        interrupt: null;
         'update:broadcasting': (_: boolean) => boolean;
         'update:completed': (_: boolean) => boolean;
         'update:error': (_: boolean) => boolean;
@@ -152,7 +154,8 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             default: undefined;
         };
     }>> & Readonly<{
-        onSetData?: ((e: import("@vunk/core").SetDataEvent) => any) | undefined;
+        onSetData?: ((e: SetDataEvent) => any) | undefined;
+        onInterrupt?: ((...args: any[]) => any) | undefined;
         "onUpdate:broadcasting"?: ((_: boolean) => any) | undefined;
         "onUpdate:completed"?: ((_: boolean) => any) | undefined;
         "onUpdate:error"?: ((_: boolean) => any) | undefined;

package/components/bubble-templates/src/types.d.ts

@@ -27,4 +27,8 @@ export interface RenderDataRecord {
      * @description 发生错误的
      */
     error?: boolean;
+    /**
+     * @description 组件实例
+     */
+    elRef?: any;
 }

package/components/chat-independent/index.mjs

@@ -1,13 +1,13 @@
-import { defineComponent, ref, computed, createElementBlock, openBlock, createElementVNode, createVNode, unref, withCtx, createCommentVNode, withDirectives, Fragment, vShow, renderSlot, nextTick } from 'vue';
+import { defineComponent, defineAsyncComponent, ref, computed, createElementBlock, openBlock, createElementVNode, createVNode, unref, withCtx, createCommentVNode, withDirectives, Fragment, vShow, renderSlot, normalizeProps, guardReactiveProps, nextTick } from 'vue';
 import { useAgentChat } from '@vunk/plus/components/agent-chat-provider';
 import { VkBubbleList } from '@vunk/plus/components/bubble-list';
-import { VkRecorderButton } from '@vunk/plus/components/recorder-button';
 import { VkSender } from '@vunk/plus/components/sender';
 import { VkKeyboardAvatar } from '@vunk/plus/icons/keyboard';
 import { VkVoiceAvatar } from '@vunk/plus/icons/voice';
 import { VkDuplex } from '@vunk/core';
 import { VkRendererData } from '@vunk/core/components/renderer-data';
 import { useDataComputed, useDeferred } from '@vunk/core/composables';
+import { isNotEmptyObject } from '@vunk/shared/object';
 
 var InputType = /* @__PURE__ */ ((InputType2) => {
   InputType2["Voice"] = "voice";
@@ -47,6 +47,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    const VkRecorderButton = defineAsyncComponent(() => import('@vunk/plus/components/recorder-button'));
     const [bubbleData, setBubbleData] = useDataComputed({}, props, emit);
     const mainRef = ref();
     const inputType = ref(InputType.Text);
@@ -56,11 +57,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const { simplicity } = useAgentChat();
     const { items: bubbleItems, onRequest } = simplicity;
     const lastBubbleData = computed(() => {
-      const key = bubbleItems.value.at(-1)?.key;
-      if (key && bubbleData.value[key]) {
-        return bubbleData.value[key];
-      }
-      return {};
+      return getBubbleDataAt(-1);
+    });
+    const clientLoading = computed(() => {
+      return isNotEmptyObject(lastBubbleData.value) && lastBubbleData.value.completed !== true;
     });
     const senderDisabled = computed(() => {
       if (lastBubbleData.value.error === true) {
@@ -79,6 +79,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         bubbleListDef.value?.scrollToBottom();
       }, 400);
     }
+    function onCancel() {
+      const lastBubble = bubbleItems.value.at(-1);
+      if (!lastBubble)
+        return;
+      lastBubble.abortController?.abort();
+      const lastBubbleData2 = bubbleData.value[lastBubble.key];
+      lastBubbleData2.elRef?.interrupt();
+      nextTick(() => {
+        lastBubbleData2.completed = true;
+      });
+    }
+    function getBubbleDataAt(index) {
+      const bubble = bubbleItems.value.at(index);
+      if (bubble?.key && bubbleData.value[bubble.key]) {
+        return bubbleData.value[bubble.key];
+      }
+      return {};
+    }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode(
@@ -104,11 +122,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                         "el-ref": unref(bubbleListReslove),
                         items: unref(bubbleItems),
                         "text-to-speech": _ctx.textToSpeech
-                      }, null, 8, ["el-ref", "items", "text-to-speech"])
+                      }, {
+                        footer: withCtx((e) => [
+                          renderSlot(_ctx.$slots, "bubble_footer", normalizeProps(guardReactiveProps(e)))
+                        ]),
+                        _: 3
+                        /* FORWARDED */
+                      }, 8, ["el-ref", "items", "text-to-speech"])
                     ])
                   ]),
-                  _: 1
-                  /* STABLE */
+                  _: 3
+                  /* FORWARDED */
                 }, 8, ["data", "onSetData"])
               ]),
               two: withCtx(() => [
@@ -159,15 +183,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                     "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => content.value = $event),
                     "auto-size": true,
                     placeholder: "\u8BF7\u8F93\u5165\u5185\u5BB9",
-                    disabled: senderDisabled.value,
-                    onSubmit
-                  }, null, 8, ["modelValue", "disabled"]), [
+                    "send-disabled": senderDisabled.value,
+                    loading: clientLoading.value,
+                    onSubmit,
+                    onCancel
+                  }, null, 8, ["modelValue", "send-disabled", "loading"]), [
                     [vShow, inputType.value === unref(InputType).Text]
                   ])
                 ])
               ]),
-              _: 1
-              /* STABLE */
+              _: 3
+              /* FORWARDED */
             })
           ],
           512