@omujs/omu 0.9.32 → 0.9.33

package/dist/esm/version.js

@@ -1,9 +1,9 @@
 // @bun
 // src/version.ts
-var VERSION = "0.9.31";
+var VERSION = "0.9.32";
 export {
   VERSION
 };
 
-//# debugId=5F4A8207EB27408664756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZlcnNpb24udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0IGNvbnN0IFZFUlNJT04gPSAnMC45LjMxJztcbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBQU8sSUFBTSxVQUFVOyIsCiAgImRlYnVnSWQiOiAiNUY0QTgyMDdFQjI3NDA4NjY0NzU2RTIxNjQ3NTZFMjEiLAogICJuYW1lcyI6IFtdCn0=
+//# debugId=DEEFD25FE9A5D95764756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZlcnNpb24udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0IGNvbnN0IFZFUlNJT04gPSAnMC45LjMyJztcbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBQU8sSUFBTSxVQUFVOyIsCiAgImRlYnVnSWQiOiAiREVFRkQyNUZFOUE1RDk1NzY0NzU2RTIxNjQ3NTZFMjEiLAogICJuYW1lcyI6IFtdCn0=

package/package.json

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

package/src/api/asset/extension.ts

@@ -53,14 +53,15 @@ const FILE_ARRAY_SERIALIZER = new Serializer<Asset[], Uint8Array>(
     },
 );
 
-export const ASSET_UPLOAD_PERMISSION_ID: Identifier = ASSET_EXTENSION_TYPE.join('upload');
+export const ASSET_PERMISSION_ID: Identifier = ASSET_EXTENSION_TYPE;
+
 const ASSET_UPLOAD_ENDPOINT = EndpointType.createSerialized<Asset, Identifier>(
     ASSET_EXTENSION_TYPE,
     {
         name: 'upload',
         requestSerializer: FILE_SERIALIZER,
         responseSerializer: Serializer.of(Identifier).toJson(),
-        permissionId: ASSET_UPLOAD_PERMISSION_ID,
+        permissionId: ASSET_PERMISSION_ID,
     },
 );
 const ASSET_UPLOAD_MANY_ENDPOINT = EndpointType.createSerialized<Asset[], Identifier[]>(
@@ -69,17 +70,16 @@ const ASSET_UPLOAD_MANY_ENDPOINT = EndpointType.createSerialized<Asset[], Identi
         name: 'upload_many',
         requestSerializer: FILE_ARRAY_SERIALIZER,
         responseSerializer: Serializer.of(Identifier).toArray().pipe(Serializer.json()),
-        permissionId: ASSET_UPLOAD_PERMISSION_ID,
+        permissionId: ASSET_PERMISSION_ID,
     },
 );
-export const ASSET_DOWNLOAD_PERMISSION_ID: Identifier = ASSET_EXTENSION_TYPE.join('download');
 const ASSET_DOWNLOAD_ENDPOINT = EndpointType.createSerialized<Identifier, Asset>(
     ASSET_EXTENSION_TYPE,
     {
         name: 'download',
         requestSerializer: Serializer.of(Identifier).pipe(Serializer.json()),
         responseSerializer: FILE_SERIALIZER,
-        permissionId: ASSET_DOWNLOAD_PERMISSION_ID,
+        permissionId: ASSET_PERMISSION_ID,
     },
 );
 const ASSET_DOWNLOAD_MANY_ENDPOINT = EndpointType.createSerialized<Identifier[], Asset[]>(
@@ -88,23 +88,40 @@ const ASSET_DOWNLOAD_MANY_ENDPOINT = EndpointType.createSerialized<Identifier[],
         name: 'download_many',
         requestSerializer: Serializer.of(Identifier).toArray().pipe(Serializer.json()),
         responseSerializer: FILE_ARRAY_SERIALIZER,
-        permissionId: ASSET_DOWNLOAD_PERMISSION_ID,
+        permissionId: ASSET_PERMISSION_ID,
     },
 );
-export const ASSET_DELETE_PERMISSION_ID: Identifier = ASSET_EXTENSION_TYPE.join('delete');
 const ASSET_DELETE_ENDPOINT = EndpointType.createJson<Identifier, null>(
     ASSET_EXTENSION_TYPE,
     {
         name: 'delete',
         requestSerializer: Identifier,
-        permissionId: ASSET_DELETE_PERMISSION_ID,
+        permissionId: ASSET_PERMISSION_ID,
+    },
+);
+
+const ASSET_GENERATE_TOKEN_ENDPOINT = EndpointType.createJson<object, { token: string }>(
+    ASSET_EXTENSION_TYPE,
+    {
+        name: 'token_generate',
+        permissionId: ASSET_PERMISSION_ID,
     },
 );
 
 export class AssetExtension {
     public readonly type: ExtensionType<AssetExtension> = ASSET_EXTENSION_TYPE;
+    private assetToken: string | undefined = undefined;
 
-    constructor(private readonly omu: Omu) {}
+    constructor(private readonly omu: Omu) {
+        omu.network.event.disconnected.listen(() => {
+            this.assetToken = undefined;
+        });
+        omu.network.addTask(async () => {
+            if (omu.permissions.required(ASSET_PERMISSION_ID)) {
+                this.requestGenerateAssetToken();
+            }
+        });
+    }
 
     public async upload(identifier: IntoId, buffer: Uint8Array): Promise<Identifier> {
         const assetIdentifier = await this.omu.endpoints.call(ASSET_UPLOAD_ENDPOINT, {
@@ -138,22 +155,39 @@ export class AssetExtension {
         await this.omu.endpoints.call(ASSET_DELETE_ENDPOINT, id);
     }
 
+    private async requestGenerateAssetToken() {
+        const result = await this.omu.endpoints.call(ASSET_GENERATE_TOKEN_ENDPOINT, {});
+        this.assetToken = result.token;
+    }
+
     public url(
         id: IntoId,
         options?: { cache?: 'no-cache' },
     ): string {
+        if (!this.assetToken) {
+            throw new Error('Asset token is not set');
+        }
         const key = Identifier.from(id).key();
         const address = this.omu.network.address;
         const protocol = address.secure ? 'https' : 'http';
+        const url = new URL(`${protocol}://${address.host}:${address.port}/asset`);
+        url.searchParams.set('asset_token', this.assetToken);
+        url.searchParams.set('id', key);
         if (options?.cache === 'no-cache') {
-            return `${protocol}://${address.host}:${address.port}/asset?id=${encodeURIComponent(key)}&t=${Date.now()}`;
+            url.searchParams.set('t', Date.now().toString());
         }
-        return `${protocol}://${address.host}:${address.port}/asset?id=${encodeURIComponent(key)}`;
+        return url.toString();
     }
 
     public proxy(url: string): string {
+        if (!this.assetToken) {
+            throw new Error('Asset token is not set');
+        }
         const address = this.omu.network.address;
         const protocol = address.secure ? 'https' : 'http';
-        return `${protocol}://${address.host}:${address.port}/proxy?url=${encodeURIComponent(url)}`;
+        const proxyUrl = new URL(`${protocol}://${address.host}:${address.port}/proxy`);
+        proxyUrl.searchParams.set('asset_token', this.assetToken);
+        proxyUrl.searchParams.set('url', url);
+        return proxyUrl.toString();
     }
 }

package/src/api/asset/index.ts

@@ -1,6 +1,5 @@
 export {
-    ASSET_DELETE_PERMISSION_ID, ASSET_DOWNLOAD_PERMISSION_ID,
-    ASSET_UPLOAD_PERMISSION_ID,
+    ASSET_PERMISSION_ID,
 } from './extension';
 export type { Asset } from './extension';
 

package/src/api/dashboard/extension.ts

@@ -202,15 +202,14 @@ const DASHBOARD_WEBVIEW_EVENT_PACKET = PacketType.createJson<WebviewEventPacket>
 });
 
 type AllowedHost = {
-    host: string;
-    apps: Identifier[];
+    id: string;
+    hosts: string[];
 };
 
-const DASHBOARD_ALLOWED_HOSTS = TableType.createJson<AllowedHost>(DASHBOARD_EXTENSION_TYPE, {
-    name: 'hosts',
-    key: (entry) => entry.host,
-    serializer: Serializer.noop<AllowedHost>()
-        .field('apps', Serializer.of(Identifier).toArray()),
+const DASHBOARD_ALLOWED_WEBVIEW_HOSTS = TableType.createJson<AllowedHost>(DASHBOARD_EXTENSION_TYPE, {
+    name: 'allowed_webview_hosts',
+    key: (entry) => entry.id,
+    permissions: { all: DASHBOARD_SET_PERMISSION_ID },
 });
 
 const DASHBOARD_HOST_REQUEST = EndpointType.createJson<{
@@ -286,6 +285,7 @@ export interface PromptRequestAppInstall extends PromptRequestBase<'app/install'
 export interface PromptRequestAppUpdate extends PromptRequestBase<'app/update'> {
     old_app: AppJson;
     new_app: AppJson;
+    dependencies: Record<string, AppJson>;
 }
 
 export interface PromptRequestIndexInstall extends PromptRequestBase<'index/install'> {
@@ -293,12 +293,24 @@ export interface PromptRequestIndexInstall extends PromptRequestBase<'index/inst
     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
 );
 
 const DASHBOARD_PROMPT_REQUEST = PacketType.createJson<PromptRequest>(DASHBOARD_EXTENSION_TYPE, {
@@ -384,7 +396,7 @@ export class DashboardExtension {
             if (!handle) return;
             handle.emit(packet.event);
         });
-        this.allowedHosts = omu.tables.get(DASHBOARD_ALLOWED_HOSTS);
+        this.allowedHosts = omu.tables.get(DASHBOARD_ALLOWED_WEBVIEW_HOSTS);
         this.speechRecognition = omu.registries.get(DASHBOARD_SPEECH_RECOGNITION);
     }
 
@@ -401,6 +413,8 @@ export class DashboardExtension {
                 return await dashboard.handleUpdateApp(request);
             case 'index/install':
                 return await dashboard.handleIndexInstall(request);
+            case 'http/port':
+                return await dashboard.handleHttpPortRequest(request);
             default:
                 throw new Error(`Unknown prompt requested: ${JSON.stringify(request)}`);
         }
@@ -451,8 +465,9 @@ export class DashboardExtension {
         this.omu.endpoints.bind(DASHBOARD_COOKIES_GET, async (request, params): Promise<UserResponse<Cookie[]>> => {
             const { url } = request;
             const { hostname } = new URL(url);
-            const allowedHost = await this.allowedHosts.get(hostname) ?? { host: hostname, apps: [] };
-            const allowed = allowedHost.apps.some((host) => host.isEqual(params.caller));
+            const id = params.caller.key();
+            const allowedHost: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
+            const allowed = allowedHost.hosts.includes(hostname);
             if (!allowed) {
                 return {
                     type: 'cancelled',
@@ -462,8 +477,9 @@ export class DashboardExtension {
         });
         this.omu.endpoints.bind(DASHBOARD_HOST_REQUEST, async (request, params): Promise<UserResponse> => {
             const { host } = request;
-            const hostEntry = await this.allowedHosts.get(host) ?? { host, apps: [] };
-            const allowed = hostEntry.apps.some((host) => host.isEqual(params.caller));
+            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',
@@ -472,7 +488,7 @@ export class DashboardExtension {
             }
             const result = await dashboard.hostRequested(request, params);
             if (result.type === 'ok') {
-                hostEntry.apps.push(params.caller);
+                hostEntry.hosts.push(host);
                 await this.allowedHosts.update(hostEntry);
             }
             return result;

package/src/api/dashboard/handler.ts

@@ -1,7 +1,7 @@
 import type { App } from '../../app.js';
 import { Identifier } from '../../identifier';
 import { InvokedParams } from '../endpoint/packets.js';
-import { Cookie, GetCookiesRequest, HostRequest, PromptRequestAppInstall, PromptRequestAppPermissions, PromptRequestAppPlugins, PromptRequestAppUpdate, PromptRequestIndexInstall, PromptResult, SpeechRecognitionStart, UserResponse, WebviewEvent, WebviewPacket, WebviewRequest } from './extension.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';
 
@@ -11,6 +11,7 @@ export interface DashboardHandler {
     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>;

package/src/api/dashboard/index.ts

@@ -13,11 +13,13 @@ export {
     UserResponse,
     WebviewPacket,
     WebviewRequest,
+    type PortProcess,
     type PromptRequest,
     type PromptRequestAppInstall,
     type PromptRequestAppPermissions,
     type PromptRequestAppPlugins,
     type PromptRequestAppUpdate,
+    type PromptRequestHttpPort,
     type PromptRequestIndexInstall,
     type PromptResult,
     type SpeechRecognitionStart,

package/src/api/extension.ts

@@ -14,6 +14,6 @@ export class ExtensionType<T extends Extension = Extension> extends Identifier {
     }
 
     public key(): string {
-        return this.name;
+        return new Identifier('ext', this.name).key();
     }
 }