@omujs/omu 0.9.42 → 0.9.47

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 0.9.47 (2025-12-18)
+
+**Note:** Version bump only for package @omujs/omu
+
+
+
+
+
+## 0.9.46 (2025-12-09)
+
+**Note:** Version bump only for package @omujs/omu
+
+
+
+
+
+## 0.9.45 (2025-11-23)
+
+
+### Bug Fixes
+
+* **dash:** token.txtを生成できない場合のエラーメッセージを修正 ([29d4c34](https://github.com/OMUAPPS/omuapps/commit/29d4c34e1fbfa60b909a56d7fbcc5e65c3424cae))
+
+
+
+
+
+## 0.9.44 (2025-11-22)
+
+**Note:** Version bump only for package @omujs/omu
+
+
+
+
+
+## 0.9.43 (2025-11-22)
+
+**Note:** Version bump only for package @omujs/omu
+
+
+
+
+
 ## 0.9.42 (2025-11-20)
 
 **Note:** Version bump only for package @omujs/omu

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "@omujs/omu",
-    "version": "0.9.42",
+    "version": "0.9.47",
     "main": "./dist/esm/index.js",
     "types": "./dist/dts/index.d.ts",
     "exports": {

package/src/api/dashboard/extension.ts

@@ -5,6 +5,7 @@ import { Omu } from '../../omu.js';
 import { PromiseResult } from '../../result.js';
 import { Serializer } from '../../serialize';
 import { EndpointType } from '../endpoint/endpoint.js';
+import { InvokedParams } from '../endpoint/packets.js';
 import { ExtensionType } from '../extension.js';
 import { PermissionTypeJson } from '../permission/permission.js';
 import { PackageInfo } from '../plugin/package-info.js';
@@ -339,12 +340,12 @@ export class DashboardExtension {
             DASHBOARD_PROMPT_REQUEST,
             DASHBOARD_PROMPT_RESPONSE,
         );
-        omu.network.addPacketHandler(DASHBOARD_PROMPT_REQUEST, (request) =>
-            this.handlePromptRequest(request),
-        );
-        omu.network.addPacketHandler(DASHBOARD_OPEN_APP_PACKET, (app) =>
-            this.handleOpenApp(app),
-        );
+        omu.network.addPacketHandler(DASHBOARD_PROMPT_REQUEST, (request) => {
+            this.handlePromptRequest(request);
+        });
+        omu.network.addPacketHandler(DASHBOARD_OPEN_APP_PACKET, (app) => {
+            this.handleOpenApp(app);
+        });
         omu.network.addPacketHandler(DASHBOARD_DRAG_DROP_REQUEST_PACKET, (request) => {
             this.handleDragDropRequest(request);
         });
@@ -442,55 +443,54 @@ export class DashboardExtension {
             throw new Error('Dashboard already set');
         }
         this.dashboard = dashboard;
+
+        this.omu.server.apps.event.remove.listen(async (apps) => {
+            for (const app of apps.values()) {
+                const hosts = await this.allowedHosts.get(app.id.key());
+                if (!hosts) continue;
+                this.allowedHosts.remove(hosts);
+            }
+        });
+
+        const requireHost = async (params: InvokedParams, host: string): Promise<UserResponse<undefined>> => {
+            const id = params.caller.key();
+            const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id: id, hosts: [] };
+            const allowed = hostEntry.hosts.includes(host);
+            if (!allowed) {
+                const result = await dashboard.handleHostRequest({
+                    host,
+                }, params);
+                if (result === 'accept') {
+                    const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id: id, hosts: [] };
+                    hostEntry.hosts.push(host);
+                    await this.allowedHosts.update(hostEntry);
+                } else {
+                    return { type: 'cancelled' };
+                }
+            }
+            return { type: 'ok', value: undefined };
+        };
+
         this.omu.endpoints.bind(DASHBOARD_COOKIES_GET, async (request, params): Promise<UserResponse<Cookie[]>> => {
             const { url } = request;
             const { host } = new URL(url);
-            const id = params.caller.key();
-            const allowedHost: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
-            const allowed = allowedHost.hosts.includes(host);
-            if (!allowed) {
-                return {
-                    type: 'cancelled',
-                };
+            const hostAccessResult = await requireHost(params, host);
+            if (hostAccessResult.type !== 'ok') {
+                return hostAccessResult;
             }
             return await dashboard.getCookies(request);
         });
         this.omu.endpoints.bind(DASHBOARD_HOST_REQUEST, async (request, params): Promise<UserResponse> => {
             const { host } = request;
-            const id = params.caller.key();
-            const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
-            const allowed = hostEntry.hosts.includes(host);
-            if (allowed) {
-                return {
-                    type: 'ok',
-                    value: undefined,
-                };
-            }
-            const result = await dashboard.hostRequested(request, params);
-            if (result.type === 'ok') {
-                hostEntry.hosts.push(host);
-                await this.allowedHosts.update(hostEntry);
-            }
+            const result = await requireHost(params, host);
             return result;
         });
         this.omu.endpoints.bind(DASHBOARD_WEBVIEW_REQUEST, async (request, params): Promise<WebviewResponse> => {
             const url = new URL(request.url);
             const { host } = url;
-            {
-                const id = params.caller.key();
-                const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
-                const allowed = hostEntry.hosts.includes(host);
-                if (!allowed) {
-                    const result = await dashboard.hostRequested({
-                        host,
-                    }, params);
-                    if (result.type === 'ok') {
-                        hostEntry.hosts.push();
-                        await this.allowedHosts.update(hostEntry);
-                    } else {
-                        return { type: 'cancelled' };
-                    }
-                }
+            const hostAccessResult = await requireHost(params, host);
+            if (hostAccessResult.type !== 'ok') {
+                return hostAccessResult;
             }
             const emit = async (event: WebviewEvent) => {
                 this.omu.send(DASHBOARD_WEBVIEW_EVENT_PACKET, {

package/src/api/dashboard/handler.ts

@@ -15,8 +15,8 @@ export interface DashboardHandler {
     handleOpenApp(app: App): Promise<void>;
     handleDragDropRequest(request: DragDropRequestDashboard): Promise<boolean>;
     handleDragDropReadRequest(request: DragDropReadRequestDashboard): Promise<DragDropReadResponse>;
+    handleHostRequest(request: HostRequest, params: InvokedParams): Promise<PromptResult>;
     getCookies(request: GetCookiesRequest): Promise<UserResponse<Cookie[]>>;
-    hostRequested(request: HostRequest, params: InvokedParams): Promise<UserResponse>;
     createWebview(request: WebviewRequest, params: InvokedParams, emit: (event: WebviewEvent) => Promise<void>): Promise<Identifier>;
     getWebview(request: WebviewPacket, params: InvokedParams): Promise<Identifier | undefined>;
     closeWebview(request: WebviewPacket, params: InvokedParams): Promise<Identifier | undefined>;

package/src/api/registry/extension.ts

@@ -164,51 +164,137 @@ class RegistryImpl<T> implements Registry<T> {
     }
 
     public compatSvelte(): Writable<T> {
-        let ready = false;
-        let value: T = this.value;
+        let isReady = false;
+        const context = {
+            changed: false,
+            markChanged: () => {
+                context.changed = true;
+                this.#set(this.value);
+                handle(this.value);
+            },
+        };
         const listeners = new Set<(value: T) => void>();
-        this.listen((newValue) => {
-            ready = true;
-            value = newValue;
-            listeners.forEach((run) => {
-                run(value);
-            });
-        });
+
+        const handle = (newValue: T) => {
+            isReady = true;
+            emit(newValue);
+        };
+
+        const unsubscribe = this.listen(handle);
+
+        const emit = (value: T) => {
+            this.value = value;
+            const proxied = proxy(value, context);
+            listeners.forEach(listener => listener(proxied));
+        };
+
         return {
             set: (value: T) => {
-                if (!ready) {
+                if (!isReady) {
                     throw new Error(`Registry ${this.type.id.key()} is not ready`);
                 }
-                this.set(value);
+                const proxied = value?.[PROXIED_SYMBOL];
+                if (proxied && !context.changed) return;
+                this.#set(value);
+                emit(value);
+                context.changed = false;
             },
-            subscribe: (run) => {
+            subscribe: (run: (value: T) => void) => {
                 listeners.add(run);
-                run(value);
+                run(proxy(this.value, context));
+
                 return () => {
                     listeners.delete(run);
+                    if (listeners.size === 0) {
+                        unsubscribe?.();
+                    }
                 };
             },
-            update: (fn) => {
-                if (!ready) {
+            update: (fn: (value: T) => T) => {
+                if (!isReady) {
                     throw new Error(`Registry ${this.type.id.key()} is not ready`);
                 }
                 this.update(fn);
             },
-            wait: () => {
-                return new Promise<T>((resolve) => {
-                    if (ready) {
-                        resolve(value);
-                    } else {
-                        listeners.add(() => {
+            wait: (): Promise<T> => {
+                return isReady
+                    ? Promise.resolve(this.value)
+                    : new Promise(resolve => {
+                        const unsubscribe = this.listen((value: T) => {
+                            unsubscribe?.();
                             resolve(value);
                         });
-                    }
-                });
+                    });
             },
         };
     }
 }
 
+const PROXIED_SYMBOL = Symbol('ProxiedRegistry');
+
+function deepEqual(objA, objB) {
+    if (objA === objB) return true; // Check for referential equality and primitive values
+
+    if (
+        typeof objA !== 'object' ||
+        typeof objB !== 'object' ||
+        objA === null ||
+        objB === null
+    ) {
+        return false;
+    }
+
+    const keysA = Object.keys(objA);
+    const keysB = Object.keys(objB);
+
+    if (keysA.length !== keysB.length) return false; // Different number of properties
+
+    for (const key of keysA) {
+        if (!keysB.includes(key) || !deepEqual(objA[key], objB[key])) {
+            return false; // Property missing or values are not deeply equal
+        }
+    }
+
+    return true; // All properties and their values are deeply equal
+}
+
+type ProxyContext = {
+    changed: boolean;
+    markChanged: () => void;
+};
+
+function proxy<T>(
+    value: T,
+    context: ProxyContext,
+) {
+    if (typeof value !== 'object' || value === null) {
+        return value;
+    }
+    if (PROXIED_SYMBOL in value) {
+        return value;
+    }
+    let changed = false;
+    return new Proxy(value, {
+        set(target, prop, value) {
+            changed = !deepEqual(target[prop], value);
+            if (!changed) return true;
+            target[prop] = value;
+            context.markChanged();
+            return true;
+        },
+        get(target, prop) {
+            if (prop === PROXIED_SYMBOL) {
+                return value;
+            }
+            return proxy(target[prop], context);
+        },
+        has(target, p) {
+            if (p === PROXIED_SYMBOL) return true;
+            return p in target;
+        },
+    });
+}
+
 export const REGISTRY_EXTENSION_TYPE: ExtensionType<RegistryExtension> = new ExtensionType(
     'registry',
     (omu: Omu) => new RegistryExtension(omu),

package/src/network/network.ts

@@ -314,4 +314,9 @@ export class Network {
         this.status = status;
         await this.event.status.emit(status);
     }
+
+    public close(): void {
+        this.setStatus({ type: 'disconnected' });
+        this.attempt = 0;
+    }
 }

package/src/omu.ts

@@ -132,6 +132,7 @@ export class Omu {
     public stop(): void {
         this.running = false;
         this.ready = false;
+        this.network.close();
         this.event.stopped.emit();
     }
 

package/src/serialize/bytebuffer.ts

@@ -257,6 +257,14 @@ export class ByteWriter {
         this.finished = true;
         return new Uint8Array(this.buffer, 0, this.offset);
     }
+
+    public toUint8Array(): Uint8Array {
+        return new Uint8Array(this.buffer, 0, this.offset);
+    }
+
+    public toArrayBuffer(): ArrayBuffer {
+        return this.buffer.slice(0, this.offset);
+    }
 }
 
 export class ByteReader {

package/src/version.ts

@@ -1,2 +1,2 @@
-export const VERSION = '0.9.42';
+export const VERSION = '0.9.47';
 export const VERSION_MINOR = '0.9.0';

package/dist/dts/address.d.ts

@@ -1,6 +0,0 @@
-export interface Address {
-	host: string;
-	port: number;
-	secure: boolean;
-	hash?: string;
-}

package/dist/dts/api/asset/extension.d.ts

@@ -1,25 +0,0 @@
-import { Identifier, IntoId } from "../../identifier";
-import { Omu } from "../../omu";
-import { ExtensionType } from "../extension.js";
-export declare const ASSET_EXTENSION_TYPE: ExtensionType<AssetExtension>;
-export type Asset = {
-	id: Identifier;
-	buffer: Uint8Array;
-};
-export declare const ASSET_PERMISSION_ID: Identifier;
-export declare class AssetExtension {
-	private readonly omu;
-	readonly type: ExtensionType<AssetExtension>;
-	private assetToken;
-	constructor(omu: Omu);
-	upload(identifier: IntoId, buffer: Uint8Array): Promise<Identifier>;
-	uploadMany(...files: Asset[]): Promise<Identifier[]>;
-	download(identifier: IntoId): Promise<Asset>;
-	downloadMany(...identifiers: IntoId[]): Promise<Asset[]>;
-	delete(identifier: IntoId): Promise<void>;
-	private requestGenerateAssetToken;
-	url(id: IntoId, options?: {
-		cache?: "no-cache";
-	}): string;
-	proxy(url: string): string;
-}

package/dist/dts/api/asset/index.d.ts

@@ -1,2 +0,0 @@
-export { ASSET_PERMISSION_ID } from "./extension";
-export type { Asset } from "./extension";

package/dist/dts/api/dashboard/extension.d.ts

@@ -1,181 +0,0 @@
-import { App, AppJson } from "../../app.js";
-import { Identifier } from "../../identifier";
-import { Omu } from "../../omu.js";
-import { PromiseResult } from "../../result.js";
-import { ExtensionType } from "../extension.js";
-import { PermissionTypeJson } from "../permission/permission.js";
-import { PackageInfo } from "../plugin/package-info.js";
-import { Registry } from "../registry/registry.js";
-import { AppIndexRegistryMeta } from "../server/extension.js";
-import type { Table } from "../table/table.js";
-import type { DashboardHandler } from "./handler.js";
-import { AppInstallResponse, DragDrop, DragDropReadResponse, DragEnter, DragLeave, DragOver, FileDragPacket } from "./packets.js";
-export declare const DASHBOARD_EXTENSION_TYPE: ExtensionType<DashboardExtension>;
-export declare const DASHBOARD_SET_PERMISSION_ID: Identifier;
-export declare const DASHBOARD_OPEN_APP_PERMISSION_ID: Identifier;
-export declare const DASHOBARD_APP_READ_PERMISSION_ID: Identifier;
-export declare const DASHOBARD_APP_EDIT_PERMISSION_ID: Identifier;
-export declare const DASHBOARD_APP_INSTALL_PERMISSION_ID: Identifier;
-export declare const DAShBOARD_DRAG_DROP_PERMISSION_ID: Identifier;
-type DragDropHandler = {
-	onEnter(fn: (event: DragEnter) => unknown): void;
-	onOver(fn: (event: DragOver) => unknown): void;
-	onDrop(fn: (event: DragDrop) => unknown): void;
-	onLeave(fn: (event: DragLeave) => unknown): void;
-	read(id: string): Promise<DragDropReadResponse>;
-};
-export type Cookie = {
-	name: string;
-	value: string;
-};
-export type WebviewRequest = {
-	url: string;
-	script?: string;
-};
-export type WebviewPacket = {
-	id: string;
-};
-export type UserResponse<T = undefined> = {
-	type: "ok";
-	value: T;
-} | {
-	type: "blocked";
-} | {
-	type: "cancelled";
-};
-export type UserError = Exclude<UserResponse, {
-	type: "ok";
-}>;
-export type WebviewResponse = UserResponse<WebviewPacket>;
-export declare const DASHBOARD_WEBVIEW_PERMISSION_ID: Identifier;
-export type HostRequest = {
-	host: string;
-};
-export type GetCookiesRequest = {
-	url: string;
-};
-export type WebviewEvent = {
-	type: "closed";
-} | {
-	type: "resize";
-	dimentions: {
-		x: number;
-		y: number;
-	};
-} | {
-	type: "cookie";
-	cookies: Cookie[];
-};
-export type WebviewEventListeners = { [K in WebviewEvent["type"]]? : Array<(event: Extract<WebviewEvent, {
-	type: K;
-}>) => void> };
-export type WebviewEventPacket = {
-	id: Identifier;
-	target: Identifier;
-	event: WebviewEvent;
-};
-export type WebviewHandle = {
-	readonly id: Identifier;
-	readonly url: string;
-	getCookies(): PromiseResult<Cookie[], UserError>;
-	on<T extends WebviewEvent["type"]>(key: T, callback: (event: Extract<WebviewEvent, {
-		type: T;
-	}>) => void): void;
-	close(): Promise<void>;
-	join(): Promise<void>;
-};
-export type WebviewEventEmit = <T extends WebviewEvent["type"]>(event: Extract<WebviewEvent, {
-	type: T;
-}>) => void;
-type AllowedHost = {
-	id: string;
-	hosts: string[];
-};
-export declare const DASHBOARD_SPEECH_RECOGNITION_PERMISSION_ID: Identifier;
-export type TranscriptSegment = {
-	confidence: number;
-	transcript: string;
-};
-export type TranscriptStatus = {
-	type: "idle";
-} | {
-	type: "result";
-	timestamp: number;
-	segments: TranscriptSegment[];
-} | {
-	type: "final";
-	timestamp: number;
-	segments: TranscriptSegment[];
-} | {
-	type: "audio_started";
-	timestamp: number;
-} | {
-	type: "audio_ended";
-	timestamp: number;
-};
-export type SpeechRecognitionStart = {
-	type: "start";
-};
-interface PromptRequestBase<T extends string> {
-	kind: T;
-	id: string;
-}
-export interface PromptRequestAppPermissions extends PromptRequestBase<"app/permissions"> {
-	app: AppJson;
-	permissions: PermissionTypeJson[];
-}
-export interface PromptRequestAppPlugins extends PromptRequestBase<"app/plugins"> {
-	app: AppJson;
-	packages: PackageInfo[];
-}
-export interface PromptRequestAppInstall extends PromptRequestBase<"app/install"> {
-	app: AppJson;
-	dependencies: Record<string, AppJson>;
-}
-export interface PromptRequestAppUpdate extends PromptRequestBase<"app/update"> {
-	old_app: AppJson;
-	new_app: AppJson;
-	dependencies: Record<string, AppJson>;
-}
-export interface PromptRequestIndexInstall extends PromptRequestBase<"index/install"> {
-	index_url: string;
-	meta?: AppIndexRegistryMeta;
-}
-export interface PortProcess {
-	port: number;
-	name: string;
-	exe: string;
-}
-export interface PromptRequestHttpPort extends PromptRequestBase<"http/port"> {
-	app: AppJson;
-	processes: PortProcess[];
-}
-export type PromptRequest = (PromptRequestAppPermissions | PromptRequestAppPlugins | PromptRequestAppInstall | PromptRequestAppUpdate | PromptRequestIndexInstall | PromptRequestHttpPort);
-export type PromptResult = "accept" | "deny" | "block";
-export declare class DashboardExtension {
-	private readonly omu;
-	readonly type: ExtensionType<DashboardExtension>;
-	private dashboard;
-	private dragDropHandler;
-	private dragDropListeners;
-	readonly allowedHosts: Table<AllowedHost>;
-	readonly speechRecognition: Registry<TranscriptStatus>;
-	private readonly webviewHandles;
-	constructor(omu: Omu);
-	private executeRequestForDashboard;
-	private handlePromptRequest;
-	private handleOpenApp;
-	private handleDragDropRequest;
-	private handleDragDropReadRequest;
-	private getDashboard;
-	set(dashboard: DashboardHandler): void;
-	requestWebview(options: WebviewRequest): PromiseResult<WebviewHandle, UserError>;
-	getCookies(options: GetCookiesRequest): PromiseResult<Cookie[], UserError>;
-	openApp(app: App): Promise<void>;
-	installApp(app: App): Promise<AppInstallResponse>;
-	clearBlockedPrompts(): Promise<null>;
-	requestDragDrop(): Promise<DragDropHandler>;
-	notifyDropDragState(packet: FileDragPacket): Promise<void>;
-	requestSpeechRecognition(): PromiseResult<Registry<TranscriptStatus>, UserError>;
-}
-export {};

package/dist/dts/api/dashboard/handler.d.ts

@@ -1,22 +0,0 @@
-import type { App } from "../../app.js";
-import { Identifier } from "../../identifier";
-import { InvokedParams } from "../endpoint/packets.js";
-import { Cookie, GetCookiesRequest, HostRequest, PromptRequestAppInstall, PromptRequestAppPermissions, PromptRequestAppPlugins, PromptRequestAppUpdate, PromptRequestHttpPort, PromptRequestIndexInstall, PromptResult, SpeechRecognitionStart, UserResponse, WebviewEvent, WebviewPacket, WebviewRequest } from "./extension.js";
-import type { DragDropReadRequestDashboard, DragDropReadResponse, DragDropRequestDashboard } from "./packets.js";
-export interface DashboardHandler {
-	handlePermissionRequest(request: PromptRequestAppPermissions): Promise<PromptResult>;
-	handlePluginRequest(request: PromptRequestAppPlugins): Promise<PromptResult>;
-	handleInstallApp(request: PromptRequestAppInstall): Promise<PromptResult>;
-	handleUpdateApp(request: PromptRequestAppUpdate): Promise<PromptResult>;
-	handleIndexInstall(request: PromptRequestIndexInstall): Promise<PromptResult>;
-	handleHttpPortRequest(request: PromptRequestHttpPort): Promise<PromptResult>;
-	handleOpenApp(app: App): Promise<void>;
-	handleDragDropRequest(request: DragDropRequestDashboard): Promise<boolean>;
-	handleDragDropReadRequest(request: DragDropReadRequestDashboard): Promise<DragDropReadResponse>;
-	getCookies(request: GetCookiesRequest): Promise<UserResponse<Cookie[]>>;
-	hostRequested(request: HostRequest, params: InvokedParams): Promise<UserResponse>;
-	createWebview(request: WebviewRequest, params: InvokedParams, emit: (event: WebviewEvent) => Promise<void>): Promise<Identifier>;
-	getWebview(request: WebviewPacket, params: InvokedParams): Promise<Identifier | undefined>;
-	closeWebview(request: WebviewPacket, params: InvokedParams): Promise<Identifier | undefined>;
-	speechRecognitionStart(request: SpeechRecognitionStart, params: InvokedParams): Promise<UserResponse<undefined>>;
-}

package/dist/dts/api/dashboard/index.d.ts

@@ -1,3 +0,0 @@
-export { Cookie, DASHBOARD_APP_INSTALL_PERMISSION_ID, DAShBOARD_DRAG_DROP_PERMISSION_ID, DASHBOARD_OPEN_APP_PERMISSION_ID, DASHBOARD_SET_PERMISSION_ID, DASHBOARD_SPEECH_RECOGNITION_PERMISSION_ID, DASHBOARD_WEBVIEW_PERMISSION_ID, DASHOBARD_APP_EDIT_PERMISSION_ID, DASHOBARD_APP_READ_PERMISSION_ID, GetCookiesRequest, HostRequest, UserResponse, WebviewPacket, WebviewRequest, type PortProcess, type PromptRequest, type PromptRequestAppInstall, type PromptRequestAppPermissions, type PromptRequestAppPlugins, type PromptRequestAppUpdate, type PromptRequestHttpPort, type PromptRequestIndexInstall, type PromptResult, type SpeechRecognitionStart, type TranscriptSegment, type TranscriptStatus, type WebviewEvent } from "./extension.js";
-export type { DashboardHandler } from "./handler";
-export { DragDropFile, DragDropReadRequestDashboard, DragDropReadResponse, DragDropRequestDashboard, FileData } from "./packets.js";