@vestra-player/sdk 1.5.2 → 1.5.4

package/dist/source-resolvers.d.ts

@@ -8,7 +8,7 @@ export type ResolvedResource = {
     headers?: Record<string, string>;
 };
 /**
- * What a resolver returns ({@link ResolverOptions.resolve}): the playable
+ * What a resolver returns ({@link WebResolverOptions.resolve}): the playable
  * stream(s) behind a page URL. Both streams must use identical `headers`;
  * different maps fail explicitly (nothing is dropped silently).
  *
@@ -35,21 +35,48 @@ export type ResolvedMedia = {
     /** A separate audio stream, when audio and video are split. */
     audio?: ResolvedResource;
 };
+/**
+ * A resolver declaration on the wire: a web resolver (`schemes` + `hosts`)
+ * or, from player 0.4.1, a file resolver (`extensions`), never both.
+ */
 export type SourceResolverDeclaration = {
     id: string;
     /** Finite initial contract: http and/or https, exact normalized host names. */
     schemes: ("http" | "https")[];
     hosts: string[];
+} | {
+    id: string;
+    /** Local files by extension: 1–16, lower-case letters or digits, no dot. */
+    extensions: string[];
+};
+/**
+ * A file resolver's answer as the handler gives it: the producer it prepared
+ * (sent to the host), `accepted` once the host selected it (with the stamp of
+ * the source it became) and `abandoned` when it never will be: the request
+ * was cancelled or answered too late. Exactly one of the two is called.
+ */
+export type ResolvedProducer = {
+    kind: "stream";
+    producerId: number;
+    accepted(reply: {
+        stamp: {
+            generation: number;
+            intentVersion: number;
+        };
+    }): Promise<void>;
+    abandoned(): Promise<void>;
 };
 export declare function sourceResolverClient(transport: Transport): {
-    /** Requires source.resolve. One registered host/scheme pair has one owner.
-     * Resolution shares source.submit arbitration and the original operation ID.
-     * This backend supports paired streams with identical header maps; different
-     * maps fail explicitly. No header is silently discarded or made global. */
+    /** Requires source.resolve. One registered host/scheme pair, and one file
+     * extension, has one owner (another plugin: `conflict`, reason
+     * `resolver-taken`). Resolution shares source.submit arbitration and the
+     * original operation ID. This backend supports paired streams with
+     * identical header maps; different maps fail explicitly. No header is
+     * silently discarded or made global. A failure is sent as its message. */
     register(declaration: SourceResolverDeclaration, handler: (request: {
         url: string;
         signal: AbortSignal;
-    }) => Promise<ResolvedMedia>): Promise<{
+    }) => Promise<ResolvedMedia | ResolvedProducer>): Promise<{
         dispose(): Promise<void>;
     }>;
 };

package/dist/source-resolvers.js

@@ -1,9 +1,14 @@
+const isProducer = (result) => result?.kind === "stream";
+/** The words of a failure, as the user will read them. */
+const reason = (error) => (error instanceof Error ? error.message : String(error)).slice(0, 2048);
 export function sourceResolverClient(transport) {
     return {
-        /** Requires source.resolve. One registered host/scheme pair has one owner.
-         * Resolution shares source.submit arbitration and the original operation ID.
-         * This backend supports paired streams with identical header maps; different
-         * maps fail explicitly. No header is silently discarded or made global. */
+        /** Requires source.resolve. One registered host/scheme pair, and one file
+         * extension, has one owner (another plugin: `conflict`, reason
+         * `resolver-taken`). Resolution shares source.submit arbitration and the
+         * original operation ID. This backend supports paired streams with
+         * identical header maps; different maps fail explicitly. No header is
+         * silently discarded or made global. A failure is sent as its message. */
         async register(declaration, handler) {
             const active = new Map();
             let disposed = false;
@@ -13,33 +18,56 @@ export function sourceResolverClient(transport) {
                     return;
                 const controller = new AbortController();
                 active.set(request.requestId, controller);
+                const live = () => !controller.signal.aborted && !disposed;
                 void (async () => {
+                    let result;
                     try {
-                        const result = await handler({
+                        result = await handler({
                             url: request.url,
                             signal: controller.signal,
                         });
-                        if (!controller.signal.aborted && !disposed) {
-                            await transport.request("sourceResolvers.respond", {
-                                requestId: request.requestId,
-                                result,
-                            });
-                        }
                     }
                     catch (error) {
-                        if (!controller.signal.aborted && !disposed) {
+                        if (live())
                             await transport
                                 .request("sourceResolvers.respond", {
                                 requestId: request.requestId,
-                                error: String(error).slice(0, 2048),
+                                error: reason(error),
                             })
                                 .catch(() => { });
+                        active.delete(request.requestId);
+                        return;
+                    }
+                    try {
+                        if (!isProducer(result)) {
+                            if (live())
+                                await transport.request("sourceResolvers.respond", {
+                                    requestId: request.requestId,
+                                    result,
+                                });
+                            return;
+                        }
+                        if (!live())
+                            return void (await result.abandoned());
+                        let reply;
+                        try {
+                            // Answered: the host no longer cancels this request.
+                            active.delete(request.requestId);
+                            reply = await transport.request("sourceResolvers.respond", {
+                                requestId: request.requestId,
+                                result: { kind: "stream", producerId: result.producerId },
+                            });
+                        }
+                        catch (error) {
+                            await result.abandoned();
+                            throw error;
                         }
+                        await result.accepted(reply);
                     }
                     finally {
                         active.delete(request.requestId);
                     }
-                })();
+                })().catch(() => { });
             });
             const offCancel = transport.on("source.resolveCancel", (value) => {
                 const request = value;

package/dist/wire.d.ts

@@ -593,7 +593,7 @@ export declare function createWire(transport: Transport): {
         register(declaration: import("./source-resolvers.ts").SourceResolverDeclaration, handler: (request: {
             url: string;
             signal: AbortSignal;
-        }) => Promise<import("./source-resolvers.ts").ResolvedMedia>): Promise<{
+        }) => Promise<import("./source-resolvers.ts").ResolvedMedia | import("./source-resolvers.ts").ResolvedProducer>): Promise<{
             dispose(): Promise<void>;
         }>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vestra-player/sdk",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Plugin API types, test host and plugin CLI for Vestra Player (apiVersion vestra/1)",
   "license": "Apache-2.0",
   "repository": {

package/slint/vestra/markdown.slint

@@ -1,9 +1,14 @@
 // Markdown display (store proposal §5):
-//   import { MarkdownView, MarkdownBlock } from "@vestra/markdown.slint";
+//   import { MarkdownView, MarkdownBlocks, MarkdownBlock } from "@vestra/markdown.slint";
 // Give `blocks` the value of `plugin.ui.markdown(text)`; the player parses
 // the Markdown and fills the rows. Links report `link-clicked(url)` with the
 // address resolved against the document's base; the plugin decides what to
 // open (usually `plugin.system.openUrl`).
+// `MarkdownView` scrolls one document. `MarkdownBlocks` does not scroll and
+// is as tall as its content: put it in your own layout or in a `ListView`
+// row (a chat message: a `[MarkdownBlock]` field of the row's struct).
+// `code-copy: true` adds a 复制 button to code blocks that reports
+// `copy-code(code)`; the plugin copies it (`plugin.clipboard`).
 import { ScrollView } from "std-widgets.slint";
 import { Theme } from "theme.slint";
 import { Icon } from "icons.slint";
@@ -45,7 +50,9 @@ export struct MarkdownBlock {
 component MarkdownBlockView {
     in property <MarkdownBlock> block;
     in property <length> available;
+    in property <bool> code-copy;
     callback link-clicked(string);
+    callback copy-code(string);
     private property <length> quote-indent: block.quote * 12px;
     private property <length> list-indent: block.indent * 16px;
     private property <length> inner: max(16px, root.available - root.quote-indent - root.list-indent);
@@ -124,6 +131,24 @@ component MarkdownBlockView {
                         default-font-size: Theme.font-body;
                     }
                 }
+                if root.code-copy: Rectangle {
+                    x: parent.width - self.width - 4px;
+                    y: 4px;
+                    width: copy-label.preferred-width + 12px;
+                    height: Theme.button-small-height;
+                    border-radius: Theme.radius-control;
+                    background: copy-touch.pressed ? Theme.button-press : copy-touch.has-hover ? Theme.button-hover : Theme.button-bg;
+                    copy-label := Text {
+                        text: "复制";
+                        color: copy-touch.has-hover ? Theme.text : Theme.text-dim;
+                        font-size: Theme.font-body;
+                        vertical-alignment: center;
+                    }
+                    copy-touch := TouchArea {
+                        mouse-cursor: pointer;
+                        clicked => { root.copy-code(block.code); }
+                    }
+                }
             }
             if block.kind == "image" && block.has-image: HorizontalLayout {
                 alignment: start;
@@ -186,12 +211,38 @@ component MarkdownBlockView {
     }
 }
 
+// Markdown blocks without scrolling, as tall as their content.
+export component MarkdownBlocks inherits Rectangle {
+    in property <[MarkdownBlock]> blocks;
+    // A 复制 button on code blocks, reporting `copy-code(code)`.
+    in property <bool> code-copy: false;
+    callback link-clicked(string);
+    callback copy-code(string);
+    min-height: column.min-height;
+    preferred-height: column.preferred-height;
+    column := VerticalLayout {
+        width: root.width;
+        spacing: 8px;
+        alignment: start;
+        for block in root.blocks: MarkdownBlockView {
+            block: block;
+            available: root.width;
+            code-copy: root.code-copy;
+            link-clicked(url) => { root.link-clicked(url); }
+            copy-code(code) => { root.copy-code(code); }
+        }
+    }
+}
+
 // A scrolling Markdown document.
 export component MarkdownView inherits Rectangle {
     in property <[MarkdownBlock]> blocks;
     // Space around the document.
     in property <length> inset: 10px;
+    // A 复制 button on code blocks, reporting `copy-code(code)`.
+    in property <bool> code-copy: false;
     callback link-clicked(string);
+    callback copy-code(string);
     scroll := ScrollView {
         width: 100%;
         height: 100%;
@@ -200,12 +251,12 @@ export component MarkdownView inherits Rectangle {
         column := VerticalLayout {
             width: scroll.visible-width;
             padding: root.inset;
-            spacing: 8px;
             alignment: start;
-            for block in root.blocks: MarkdownBlockView {
-                block: block;
-                available: scroll.visible-width - 2 * root.inset;
+            MarkdownBlocks {
+                blocks: root.blocks;
+                code-copy: root.code-copy;
                 link-clicked(url) => { root.link-clicked(url); }
+                copy-code(code) => { root.copy-code(code); }
             }
         }
     }