feat: midl nx pipeline

experiments/fiber-host/src/components/Host.tsx

@@ -1,5 +1,6 @@
 "use client"
 
+import { ObjType } from "midl_TODO"
 import type { Libp2p, PeerId, PrivateKey, PublicKey } from "@libp2p/interface"
 import { keys } from "@libp2p/crypto"
 import { peerIdFromKeys } from "@libp2p/peer-id"

nx.json

@@ -37,8 +37,8 @@
         },
         "@nx/js:tsc": {
             "cache": true,
-            "dependsOn": ["^build"],
-            "inputs": ["default", "^default"]
+
+            "inputs": []
         }
     },
     "useInferencePlugins": true,

sdk/midl/fx/rights.midl

@@ -1,7 +1,7 @@
 // Copyright 2019 The Fuchsia Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-library zx;
+library fx;
 
 // TODO(scottmg): (1 << 4) notation or something else for bits would be nice.
 type Rights = strict bits : uint32 {

src/typescript/fiber-kernel/src/lib/index.ts

@@ -72,7 +72,8 @@ function msg_get_handles(
 
     for (let i = 0; i < num_handles; ++i) {
         const ref = new Ref(0);
-        map_handle_to_value(up, handle_list[i], ref);
+        // TODO: remove null assertion
+        map_handle_to_value(up, handle_list[i]!, ref);
         hvs[i] = ref.value;
     }
 
@@ -91,7 +92,8 @@ function msg_get_handles(
             }
         }*/
 
-        const handle = new HandleOwner(handle_list[i]);
+        // TODO: remove null assertion
+        const handle = new HandleOwner(handle_list[i]!);
         // TODO(https://fxbug.dev/42105832): This takes a lock per call. Consider doing these in a
         // batch.
         up.handle_table().add_handle(handle);

src/typescript/fiber-kernel/src/lib/object/handle-owner.ts

@@ -3,7 +3,7 @@ import { Handle } from "./handle"
 
 // HandleOwner wraps a Handle in an Arc that has shared
 // ownership of the Handle and deletes it whenever it falls out of scope.
-export class HandleOwner implements Disposable {
+export class HandleOwner {
     constructor(public handle: Handle) {}
 
     dispatcher() {
@@ -21,8 +21,4 @@ export class HandleOwner implements Disposable {
     has_rights(rights: fx_rights_t) {
         return this.handle.has_rights(rights)
     }
-
-    [Symbol.dispose](): void {
-        console.log("removed")
-    }
 }

src/typescript/fiber-kernel/src/lib/object/handle.ts

@@ -52,7 +52,7 @@ function conditional_select_nospec_eq(x: number, y: number, a: number, b: number
 // const gHandleTableArena : Handle[] = []
 
 /** A Handle is how a specific process refers to a specific Dispatcher. */
-export class Handle implements Disposable {
+export class Handle {
     #handle_table_id: bigint
     #dispatcher: Dispatcher
     #rights: fx_rights_t
@@ -83,10 +83,6 @@ export class Handle implements Disposable {
         return new Handle(dispatcher, rights, base_value)
     }
 
-    [Symbol.dispose](): void {
-        throw new Error("Method not implemented.")
-    }
-
     public static make_dispather(dispatcher: Dispatcher, rights: fx_rights_t): HandleOwner {
         const base_value = new Ref(0)
         const addr = gHandleTableArena.alloc(dispatcher, "new", base_value)

src/typescript/fiber-kernel/src/lib/userboot/userboot.ts

@@ -113,8 +113,8 @@ class ChildMessageLayout {
     }
 }
 
-class ChildContext implements Disposable {
-    [Symbol.dispose](): void {
+class ChildContext {
+    destroy(): void {
         for (const handle of this.handles) {
             fx_handle_close(handle);
         }
@@ -210,7 +210,7 @@ function parse_next_process_arguments(next: string, argv: { value: string[] }):
         return;
     }
 
-    const args = next.split("+")
+    const args = next.split("+");
     argv.value = args;
 
     // At a minimum, child processes will be passed a single argument containing the binary name.
@@ -323,7 +323,7 @@ async function bootstrap(channel: fx.Channel): Promise<u32> {
 
     handle_termination(info);
 
-    return 0
+    return 0;
 }
 
 type TerminationInfo = {

src/typescript/fiber-kernel/tsconfig.json

@@ -4,7 +4,7 @@
         "module": "commonjs",
         "forceConsistentCasingInFileNames": true,
         "strict": true,
-        "lib": ["ESNext.Disposable", "DOM"],
+        "lib": ["DOM"],
         "esModuleInterop": true,
         "noImplicitOverride": true,
         "noPropertyAccessFromIndexSignature": true,

src/typescript/fiber-ts/src/handle/channel.ts

@@ -12,6 +12,7 @@ import {
     fx_handle_disposition_t,
     u32,
     fx_handle_t,
+    FX_OK,
 } from "@meshx-org/fiber-types";
 import { HandleWrapper, HandleWrapperPair } from "./handle-wrapper";
 import { Handle } from "./handle";
@@ -36,7 +37,7 @@ export class Channel extends HandleWrapper {
     static MAX_MSG_BYTES = FX_CHANNEL_MAX_MSG_BYTES;
     static MAX_MSG_HANDLES = FX_CHANNEL_MAX_MSG_HANDLES;
 
-    /*writeEtc(data: Uint8Array, handleDispositions: HandleDisposition[] = []): Status {
+    writeEtc(data: Uint8Array, handleDispositions: HandleDisposition[] = []): Status {
         if (!this.handle || !this.handle.isValid) return Status.ERR_BAD_HANDLE;
 
         const fx_handle_dispositions: fx_handle_disposition_t[] = [];
@@ -51,14 +52,14 @@ export class Channel extends HandleWrapper {
             });
         }
 
-        const status = self.fiber.sys_channel_write_etc(
+        const status = FX_OK;/*self.fiber.sys_channel_write_etc(
             this.handle.raw,
             0,
             data.buffer,
             data.byteLength,
             fx_handle_dispositions,
             fx_handle_dispositions.length
-        );
+        );*/
 
         for (let i = 0; i < handleDispositions.length; ++i) {
             handleDispositions[i].result = fx_handle_dispositions[i].result;
@@ -70,7 +71,7 @@ export class Channel extends HandleWrapper {
         }
 
         return status;
-    }*/
+    }
 
     write(flags: u32, data: Uint8Array, handles: fx_handle_t[]): Status {
         if (!this.handle || !this.handle.isValid) return Status.ERR_BAD_HANDLE;

src/typescript/fiber-ts/src/handle/process.ts

@@ -1,25 +1,24 @@
-import {  } from "@meshx-org/fiber-sys"
-import { FX_HANDLE_INVALID, Ref, Status, fx_status_t } from "@meshx-org/fiber-types"
-import { HandleWrapper } from "./handle-wrapper"
-import { Handle } from "./handle"
-import { Job } from "./job"
-import { CreateResult } from "./types"
+import {} from "@meshx-org/fiber-sys";
+import { FX_HANDLE_INVALID, Ref, Status, fx_status_t } from "@meshx-org/fiber-types";
+import { HandleWrapper } from "./handle-wrapper";
+import { Handle } from "./handle";
+import { Job } from "./job";
+import { CreateResult } from "./types";
 
 export class Process extends HandleWrapper {
     constructor(raw: number) {
-        super(Handle.from_raw(raw))
+        super(Handle.from_raw(raw));
     }
 
     public static create(parent: Job, name: string): CreateResult<Process> {
-        const process = new Ref(FX_HANDLE_INVALID)
-        const vmar = new Ref(FX_HANDLE_INVALID)
+        const process = new Ref(FX_HANDLE_INVALID);
 
-        const status = self.fiber.sys_process_create(parent.handle?.raw, name, 0, process, vmar)
+        const status = self.fiber.sys_process_create(parent.handle?.raw, name, 0, process);
 
         return {
             status,
             handle: status == Status.OK ? new Process(process.value) : undefined,
-        }
+        };
     }
 
     /// Similar to `Thread::start`, but is used to start the first thread in a process.
@@ -28,9 +27,9 @@ export class Process extends HandleWrapper {
     /// [fx_process_start](https://fuchsia.dev/fuchsia-src/reference/syscalls/process_start.md)
     /// syscall.
     public start(entry: string, arg1: Handle): fx_status_t {
-        const process_raw = this.handle.raw
-        const arg1_raw = arg1.raw
+        const process_raw = this.handle.raw;
+        const arg1_raw = arg1.raw;
 
-        return self.fiber.sys_process_start(process_raw, entry, arg1_raw, 0)
+        return self.fiber.sys_process_start(process_raw, entry, arg1_raw, 0);
     }
 }

src/typescript/fiber-ts/src/handle/socket.ts

@@ -1,11 +1,11 @@
 /// Typed wrapper around a socket objects
 
-import { Handle } from './handle';
-import { HandleWrapper } from './handle-wrapper';
+import { Handle } from "./handle";
+import { HandleWrapper } from "./handle-wrapper";
 
 /// fx_socket_create() syscall used to create them.
 export class Socket extends HandleWrapper {
-    constructor(handle: Handle | null) {
-        super(handle)
+    constructor(handle: Handle) {
+        super(handle);
     }
-}
+}

src/typescript/midl/src/lib/interface.ts

@@ -6,7 +6,7 @@
 import { Channel, ChannelPair, ChannelReader, ChannelReaderError } from "@meshx-org/fiber-ts"
 import { MidlError, ErrorCode } from "./errors"
 import { IncomingMessage, IncomingMessageSink, OutgoingMessage, OutgoingMessageSink } from "./message"
-import { Status } from "@meshx-org/fiber-types"
+import { FX_OK, Status } from "@meshx-org/fiber-types"
 import { Completer } from "./completer"
 
 export const epitaphOrdinal = 0xffffffffffffffffn
@@ -159,8 +159,8 @@ export class InterfacePair<T> {
 
     constructor() {
         const pair = ChannelPair.create()!
-        this.request = new InterfaceRequest<T>(pair.first)
-        this.handle = new InterfaceHandle<T>(pair.second)
+        this.request = new InterfaceRequest<T>(pair.handle!.first)
+        this.handle = new InterfaceHandle<T>(pair.handle!.second)
     }
 
     passRequest(): InterfaceRequest<T> | null {
@@ -229,19 +229,19 @@ export abstract class Binding<T> {
     wrap(impl: T): InterfaceHandle<T> | null {
         // TODO assert(!isBound)
         const pair = ChannelPair.create()
-        if (!pair) {
+        if (pair.status !== FX_OK) {
             return null
         }
 
         this.#impl = impl
-        this._reader.bind(pair.first)
+        this._reader.bind(pair.handle!.first)
 
         const callback = this.onBind
         if (callback != null) {
             callback()
         }
 
-        return new InterfaceHandle<T>(pair.second)
+        return new InterfaceHandle<T>(pair.handle!.second)
     }
 
     /// Binds the given implementation to the given interface request.
@@ -449,21 +449,21 @@ export class ProxyController<T> {
     /// The proxy must not already have been bound.
     request(): InterfaceRequest<T> {
         // TODO: assert(!isBound);
-        const pair = ChannelPair.create()
-        if (!pair) {
+        const result = ChannelPair.create()
+        if (result.status !== FX_OK) {
             throw new Error("channel creation failed")
         }
 
         // TODO: assert(pair.status == FX.OK);
-        this._reader.bind(pair.first)
+        this._reader.bind(result.handle!.first)
         this._boundCompleter.complete(null)
 
         const callback = this.onBind
         if (callback != null) {
             callback()
         }
 
-        return new InterfaceRequest<T>(pair.second)
+        return new InterfaceRequest<T>(result.handle!.second)
     }
 
     /// Binds the proxy to the given interface handle.

tools/buildtool/BUILD.hcl

@@ -5,7 +5,7 @@ midl "com.example" {
   #  "sdk/midl/meshx.drm",
   #  "sdk/midl/meshx.media2",
   #  "sdk/midl/meshx.mem",
-  #  "fiber/vdso/zx",
+  #  "fiber/fx",
   #]
 }
 
@@ -21,7 +21,7 @@ meshx_package "buildtool" {
 }
 
 resource "font" {
-  sources = [terminal_font_path]
+  sources = []
   outputs = ["data/font.ttf"]
 }