@linxiraos/pi-wire 1.1.14 → 1.1.16

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.1.16] - 2026-09-19
+
+- 上游 v18.2.5 同步:stream 线形契约与 redaction 支持。
+
 ## [1.1.14] - 2026-09-12
 
 - 随 1.1.14 版本线发布:bazel 构建面(crates/*/BUILD.bazel)版本号纳入一致性检查,CI 原生构建与桌面冒烟守卫修复。

package/THIRD-PARTY-NOTICES.txt

@@ -10843,7 +10843,7 @@ RUST RUNTIME DEPENDENCY LICENSES
 
 Generated from Cargo.lock by cargo-about 0.8.2 in locked, offline, workspace, all-feature, all-target mode, then restricted using cargo metadata to normal and build edges reachable from the workspace (development-only edges are excluded). cargo-deny independently evaluates the complete all-target graph.
 
-Native Opus (audiopus/audiopus_sys) and PCRE2 (pcre2/pcre2-sys) are covered by the exact crate license payloads below. inferno 0.12.8 is package-scoped as CDDL-1.0: its CDDL-covered source remains available in the locked crates.io source archive at https://crates.io/crates/inferno/0.12.8 and https://github.com/jonhoo/inferno. The full locked license text follows below.
+Native Opus (opus/opusic-sys) and PCRE2 (pcre2/pcre2-sys) are covered by the exact crate license payloads below. inferno 0.12.8 is package-scoped as CDDL-1.0: its CDDL-covered source remains available in the locked crates.io source archive at https://crates.io/crates/inferno/0.12.8 and https://github.com/jonhoo/inferno. The full locked license text follows below.
 
 -------------------------------------------------------------------------------
 License: Apache License 2.0 (Apache-2.0)
@@ -12509,6 +12509,58 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+-------------------------------------------------------------------------------
+License: BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)
+Used by:
+- opusic-sys 0.7.5 (https://github.com/DoumanAsh/opusic-sys)
+
+Full license text:
+
+Copyright 2001-2023 Xiph.Org, Skype Limited, Octasic,
+                    Jean-Marc Valin, Timothy B. Terriberry,
+                    CSIRO, Gregory Maxwell, Mark Borgerding,
+                    Erik de Castro Lopo, Mozilla, Amazon
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of Internet Society, IETF or IETF Trust, nor the
+names of specific contributors, may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Opus is subject to the royalty-free patent licenses which are
+specified at:
+
+Xiph.Org Foundation:
+https://datatracker.ietf.org/ipr/1524/
+
+Microsoft Corporation:
+https://datatracker.ietf.org/ipr/1914/
+
+Broadcom Corporation:
+https://datatracker.ietf.org/ipr/1526/
+
 -------------------------------------------------------------------------------
 License: BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)
 Used by:
@@ -13290,29 +13342,6 @@ jurisdiction of the Federal Courts of the Northern District of
 California and the state courts of the State of California, with
 venue lying in Santa Clara County, California.
 
--------------------------------------------------------------------------------
-License: ISC License (ISC)
-Used by:
-- audiopus_sys 0.2.2 (https://github.com/lakelezz/audiopus_sys.git)
-
-Full license text:
-
-ISC License
-
-Copyright (c) 2019, Lakelezz
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
 -------------------------------------------------------------------------------
 License: ISC License (ISC)
 Used by:
@@ -18734,7 +18763,7 @@ DEALINGS IN THE SOFTWARE.
 -------------------------------------------------------------------------------
 License: MIT License (MIT)
 Used by:
-- opus 0.3.1 (https://github.com/SpaceManiac/opus-rs)
+- opus 0.4.0 (https://github.com/SpaceManiac/opus-rs)
 
 Full license text:
 

package/dist/types/index.d.ts

@@ -454,3 +454,4 @@ export type RelayControlToGuest = {
     t: "room-closed";
 };
 export type RelayControlMessage = RelayControlToHost | RelayControlToGuest;
+export * from "./stream.js";

package/dist/types/stream.d.ts

@@ -0,0 +1,190 @@
+/**
+ * Wire types for `omp stream`: Twitch-style live screen sharing at
+ * `live.omp.sh/<username>`.
+ *
+ * Independent from collab. A publisher (`omp stream`) sends plaintext JSON
+ * screen deltas for one or more panes (one pane per omp session attached in
+ * the same working directory); the stream server materializes each pane
+ * (viewport + bounded history) so late viewers receive a snapshot without
+ * touching the publisher, fans frames out to viewers, and hosts chat.
+ *
+ * Rows are terminal lines carrying only SGR and OSC 8 escapes; the publisher
+ * strips every other sequence, truncates to the pane width, and redacts
+ * secrets before a row leaves the session process.
+ */
+/** Default stream server; its host route derives the channel from the bearer identity. */
+export declare const DEFAULT_STREAM_URL = "https://live.omp.sh";
+/** Protocol version carried in `hello`/`snapshot`; the server rejects mismatches. */
+export declare const STREAM_PROTO = 1;
+/** Channel names are Stencil usernames: lowercase letters, numbers, and underscores; 3–32 chars. */
+export declare const STREAM_CHANNEL_NAME_RE: RegExp;
+/** Longest accepted stream and pane title. */
+export declare const STREAM_TITLE_MAX = 120;
+/** Longest accepted chat display name. */
+export declare const STREAM_CHAT_NAME_MAX = 24;
+/** Longest accepted chat message. */
+export declare const STREAM_CHAT_TEXT_MAX = 500;
+/** History rows the server retains per pane; older rows fall off the top. */
+export declare const STREAM_HISTORY_LIMIT = 2000;
+/** One terminal row: ANSI text limited to SGR + OSC 8, width-truncated. */
+export type StreamRow = string;
+/**
+ * Per-pane screen deltas. `pane` ids are assigned by the publisher and are
+ * unique for the lifetime of one host connection.
+ *
+ * - `history` appends rows committed above the viewport (append-only).
+ * - `viewport` replaces the whole live viewport.
+ * - `patch` rewrites individual viewport rows; `rows` is the new viewport
+ *   length (shrinks drop trailing rows, growth fills with empty rows before
+ *   ops apply).
+ * - `reset` clears history and viewport (the session cleared its screen).
+ */
+export type StreamPaneFrame = {
+    t: "pane-open";
+    pane: number;
+    title: string;
+    cols: number;
+    rows: number;
+} | {
+    t: "pane-close";
+    pane: number;
+} | {
+    t: "resize";
+    pane: number;
+    cols: number;
+    rows: number;
+} | {
+    t: "history";
+    pane: number;
+    rows: StreamRow[];
+} | {
+    t: "viewport";
+    pane: number;
+    rows: StreamRow[];
+} | {
+    t: "patch";
+    pane: number;
+    ops: [index: number, row: StreamRow][];
+    rows: number;
+} | {
+    t: "reset";
+    pane: number;
+} | {
+    t: "paused";
+    pane: number;
+    paused: boolean;
+};
+/** Publisher → server. `hello` is the first frame on the socket. */
+export type StreamHostFrame = {
+    t: "hello";
+    proto: number;
+    title: string;
+} | {
+    t: "title";
+    title: string;
+}
+/** Message typed by the streamer; broadcast with `host: true`. */
+ | {
+    t: "chat";
+    text: string;
+} | StreamPaneFrame;
+export interface StreamChatMessage {
+    /** Monotonic per channel-session; viewers use it for de-duplication. */
+    id: number;
+    name: string;
+    text: string;
+    /** Unix milliseconds. */
+    ts: number;
+    /** Set when the streamer sent it. */
+    host?: boolean;
+}
+/** Server → publisher. */
+export type StreamServerToHost = 
+/** `user` is the stencil.so username the bearer resolved to; shown as the host's chat name. */
+{
+    t: "welcome";
+    proto: number;
+    channel: string;
+    url: string;
+    user?: string;
+} | {
+    t: "viewers";
+    n: number;
+} | {
+    t: "chat";
+    msg: StreamChatMessage;
+} | {
+    t: "error";
+    message: string;
+};
+/** Directory entry served by `GET /api/channels` and `GET /api/channels/<name>`. */
+export interface StreamChannelInfo {
+    name: string;
+    title: string;
+    live: boolean;
+    viewers: number;
+    panes: number;
+    /** stencil.so username of the channel owner (the first authenticated host). */
+    owner?: string;
+    /** Unix milliseconds of the current live session; absent when offline. */
+    startedAt?: number;
+}
+/** Materialized pane state delivered to a joining viewer. */
+export interface StreamPaneSnapshot {
+    id: number;
+    title: string;
+    cols: number;
+    rows: number;
+    history: StreamRow[];
+    viewport: StreamRow[];
+    paused: boolean;
+}
+/**
+ * Server → viewer. `snapshot` is the first frame after connect and again
+ * whenever the publisher reconnects; `offline` means the publisher left and
+ * the viewer should keep the socket open for the next `snapshot`.
+ */
+export type StreamServerToViewer = {
+    t: "snapshot";
+    proto: number;
+    channel: StreamChannelInfo;
+    panes: StreamPaneSnapshot[];
+    chat: StreamChatMessage[];
+} | {
+    t: "offline";
+} | {
+    t: "title";
+    title: string;
+} | {
+    t: "viewers";
+    n: number;
+} | {
+    t: "chat";
+    msg: StreamChatMessage;
+} | StreamPaneFrame;
+/** Viewer → server. The display name travels with each message until accounts exist. */
+export type StreamViewerFrame = {
+    t: "chat";
+    name: string;
+    text: string;
+};
+/** WebSocket close codes used by the stream server. */
+export declare const STREAM_CLOSE_HOST_CONFLICT = 4009;
+export declare const STREAM_CLOSE_BAD_CHANNEL = 4004;
+export declare const STREAM_CLOSE_PROTO_MISMATCH = 4010;
+/** Host bearer token missing, expired, or not issued by the stencil.so issuer. */
+export declare const STREAM_CLOSE_UNAUTHORIZED = 4401;
+/** Channel is owned by a different stencil.so account. */
+export declare const STREAM_CLOSE_FORBIDDEN = 4403;
+/** Provider id under which `/login` stores the stencil.so credential; `STENCIL_API_KEY` overrides it. */
+export declare const STREAM_AUTH_PROVIDER = "stencil";
+export declare const STREAM_AUTH_ENV = "STENCIL_API_KEY";
+/** HTTP/WS route layout of the stream server, relative to `DEFAULT_STREAM_URL`. */
+export declare const STREAM_ROUTES: {
+    readonly channels: "/api/channels";
+    readonly channel: (name: string) => string;
+    /** The server derives the host channel from the authenticated username. */
+    readonly host: "/ws/host";
+    readonly watch: (name: string) => string;
+    readonly page: (name: string) => string;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@linxiraos/pi-wire",
-	"version": "1.1.14",
+	"version": "1.1.16",
 	"description": "Shared wire protocol types for Oh My Pi packages",
 	"homepage": "https://linxira-os.github.io/zeta/",
 	"author": "Can Boluk",

package/src/index.ts

@@ -442,3 +442,5 @@ export type RelayControlToHost = { t: "peer-joined" | "peer-left"; peer: number
 /** Relay → guest control message. */
 export type RelayControlToGuest = { t: "room-closed" };
 export type RelayControlMessage = RelayControlToHost | RelayControlToGuest;
+
+export * from "./stream";

package/src/stream.ts

@@ -0,0 +1,152 @@
+/**
+ * Wire types for `omp stream`: Twitch-style live screen sharing at
+ * `live.omp.sh/<username>`.
+ *
+ * Independent from collab. A publisher (`omp stream`) sends plaintext JSON
+ * screen deltas for one or more panes (one pane per omp session attached in
+ * the same working directory); the stream server materializes each pane
+ * (viewport + bounded history) so late viewers receive a snapshot without
+ * touching the publisher, fans frames out to viewers, and hosts chat.
+ *
+ * Rows are terminal lines carrying only SGR and OSC 8 escapes; the publisher
+ * strips every other sequence, truncates to the pane width, and redacts
+ * secrets before a row leaves the session process.
+ */
+
+/** Default stream server; its host route derives the channel from the bearer identity. */
+export const DEFAULT_STREAM_URL = "https://live.omp.sh";
+
+/** Protocol version carried in `hello`/`snapshot`; the server rejects mismatches. */
+export const STREAM_PROTO = 1;
+
+/** Channel names are Stencil usernames: lowercase letters, numbers, and underscores; 3–32 chars. */
+export const STREAM_CHANNEL_NAME_RE = /^[a-z0-9][a-z0-9_]{2,31}$/;
+
+/** Longest accepted stream and pane title. */
+export const STREAM_TITLE_MAX = 120;
+/** Longest accepted chat display name. */
+export const STREAM_CHAT_NAME_MAX = 24;
+/** Longest accepted chat message. */
+export const STREAM_CHAT_TEXT_MAX = 500;
+/** History rows the server retains per pane; older rows fall off the top. */
+export const STREAM_HISTORY_LIMIT = 2000;
+
+/** One terminal row: ANSI text limited to SGR + OSC 8, width-truncated. */
+export type StreamRow = string;
+
+/**
+ * Per-pane screen deltas. `pane` ids are assigned by the publisher and are
+ * unique for the lifetime of one host connection.
+ *
+ * - `history` appends rows committed above the viewport (append-only).
+ * - `viewport` replaces the whole live viewport.
+ * - `patch` rewrites individual viewport rows; `rows` is the new viewport
+ *   length (shrinks drop trailing rows, growth fills with empty rows before
+ *   ops apply).
+ * - `reset` clears history and viewport (the session cleared its screen).
+ */
+export type StreamPaneFrame =
+	| { t: "pane-open"; pane: number; title: string; cols: number; rows: number }
+	| { t: "pane-close"; pane: number }
+	| { t: "resize"; pane: number; cols: number; rows: number }
+	| { t: "history"; pane: number; rows: StreamRow[] }
+	| { t: "viewport"; pane: number; rows: StreamRow[] }
+	| { t: "patch"; pane: number; ops: [index: number, row: StreamRow][]; rows: number }
+	| { t: "reset"; pane: number }
+	| { t: "paused"; pane: number; paused: boolean };
+
+/** Publisher → server. `hello` is the first frame on the socket. */
+export type StreamHostFrame =
+	| { t: "hello"; proto: number; title: string }
+	| { t: "title"; title: string }
+	/** Message typed by the streamer; broadcast with `host: true`. */
+	| { t: "chat"; text: string }
+	| StreamPaneFrame;
+
+export interface StreamChatMessage {
+	/** Monotonic per channel-session; viewers use it for de-duplication. */
+	id: number;
+	name: string;
+	text: string;
+	/** Unix milliseconds. */
+	ts: number;
+	/** Set when the streamer sent it. */
+	host?: boolean;
+}
+
+/** Server → publisher. */
+export type StreamServerToHost =
+	/** `user` is the stencil.so username the bearer resolved to; shown as the host's chat name. */
+	| { t: "welcome"; proto: number; channel: string; url: string; user?: string }
+	| { t: "viewers"; n: number }
+	| { t: "chat"; msg: StreamChatMessage }
+	| { t: "error"; message: string };
+
+/** Directory entry served by `GET /api/channels` and `GET /api/channels/<name>`. */
+export interface StreamChannelInfo {
+	name: string;
+	title: string;
+	live: boolean;
+	viewers: number;
+	panes: number;
+	/** stencil.so username of the channel owner (the first authenticated host). */
+	owner?: string;
+	/** Unix milliseconds of the current live session; absent when offline. */
+	startedAt?: number;
+}
+
+/** Materialized pane state delivered to a joining viewer. */
+export interface StreamPaneSnapshot {
+	id: number;
+	title: string;
+	cols: number;
+	rows: number;
+	history: StreamRow[];
+	viewport: StreamRow[];
+	paused: boolean;
+}
+
+/**
+ * Server → viewer. `snapshot` is the first frame after connect and again
+ * whenever the publisher reconnects; `offline` means the publisher left and
+ * the viewer should keep the socket open for the next `snapshot`.
+ */
+export type StreamServerToViewer =
+	| {
+			t: "snapshot";
+			proto: number;
+			channel: StreamChannelInfo;
+			panes: StreamPaneSnapshot[];
+			chat: StreamChatMessage[];
+	  }
+	| { t: "offline" }
+	| { t: "title"; title: string }
+	| { t: "viewers"; n: number }
+	| { t: "chat"; msg: StreamChatMessage }
+	| StreamPaneFrame;
+
+/** Viewer → server. The display name travels with each message until accounts exist. */
+export type StreamViewerFrame = { t: "chat"; name: string; text: string };
+
+/** WebSocket close codes used by the stream server. */
+export const STREAM_CLOSE_HOST_CONFLICT = 4009;
+export const STREAM_CLOSE_BAD_CHANNEL = 4004;
+export const STREAM_CLOSE_PROTO_MISMATCH = 4010;
+/** Host bearer token missing, expired, or not issued by the stencil.so issuer. */
+export const STREAM_CLOSE_UNAUTHORIZED = 4401;
+/** Channel is owned by a different stencil.so account. */
+export const STREAM_CLOSE_FORBIDDEN = 4403;
+
+/** Provider id under which `/login` stores the stencil.so credential; `STENCIL_API_KEY` overrides it. */
+export const STREAM_AUTH_PROVIDER = "stencil";
+export const STREAM_AUTH_ENV = "STENCIL_API_KEY";
+
+/** HTTP/WS route layout of the stream server, relative to `DEFAULT_STREAM_URL`. */
+export const STREAM_ROUTES = {
+	channels: "/api/channels",
+	channel: (name: string) => `/api/channels/${name}`,
+	/** The server derives the host channel from the authenticated username. */
+	host: "/ws/host",
+	watch: (name: string) => `/ws/watch/${name}`,
+	page: (name: string) => `/${name}`,
+} as const;