*Moved protomux client to its own package

package.json

@@ -10,17 +10,19 @@
     },
     "dependencies": {
         "@lumeweb/interface-relay": "git+https://git.lumeweb.com/LumeWeb/interface-relay.git",
+        "protomux": "git+https://git.lumeweb.com/LumeWeb/kernel-protomux-client.git",
         "@lumeweb/kernel-swarm-client": "git+https://git.lumeweb.com/LumeWeb/kernel-swarm-client.git",
         "@lumeweb/libkernel-universal": "git+https://git.lumeweb.com/LumeWeb/libkernel-universal.git",
+        "@lumeweb/protomux-rpc-web": "git+https://git.lumeweb.com/LumeWeb/protomux-rpc-web.git",
         "@lumeweb/rpc-client": "git+https://git.lumeweb.com/LumeWeb/rpc-client.git",
         "b4a": "^1.6.3",
         "libkmodule": "^0.2.53",
-        "p-defer": "^4.0.0",
-        "protomux": "git+https://git.lumeweb.com/LumeWeb/protomux.git"
+        "p-defer": "^4.0.0"
     },
     "devDependencies": {
         "@scure/bip39": "^1.2.0",
         "@skynetlabs/skynet-nodejs": "^2.9.0",
+        "@types/b4a": "^1.6.0",
         "@types/node": "^18.15.11",
         "@types/read": "^0.0.29",
         "cli-progress": "^3.12.0",
@@ -31,6 +33,6 @@
     },
     "browser": {
         "timers": "timers-browserify",
-        "protomux": "./src/protomux.ts"
+        "protomux-rpc": "@lumeweb/protomux-rpc-web"
     }
 }

src/index.ts

@@ -1,7 +1,7 @@
 import { addHandler, handleMessage } from "libkmodule";
 import type { ActiveQuery } from "libkmodule";
 import { createClient, SwarmClient } from "@lumeweb/kernel-swarm-client";
-import { RpcNetwork, RpcQueryOptions } from "@lumeweb/rpc-client";
+import { RpcNetwork, RpcQueryOptions, setupStream } from "@lumeweb/rpc-client";
 import type { RPCRequest, RPCResponse } from "@lumeweb/interface-relay";
 
 onmessage = handleMessage;
@@ -98,6 +98,8 @@ async function createNetwork(def = true): Promise<number> {
   const id = nextId();
   networkInstances.set(id, dhtInstance);
 
+  dhtInstance.swarm.on("setup", async (peer: any) => setupStream(peer));
+
   return id;
 }
 

src/protomux.ts

@@ -1,263 +0,0 @@
-import { Client, factory } from "@lumeweb/libkernel-universal";
-const MODULE = "_AXYJDzn2fjd-YfuchEegna7iErhun6QwQK7gSa3UNjHvw";
-
-import defer from "p-defer";
-
-class Protomux {
-  private isProtomux = true;
-
-  constructor(stream: any) {
-    this._stream = stream;
-    if (!stream.userData) {
-      stream.userData = this;
-    }
-  }
-
-  private _stream: any;
-
-  get stream(): any {
-    return this._stream;
-  }
-
-  static from(stream: any) {
-    if (stream.userData && stream.userData.isProtomux) return stream.userData;
-    if (stream.isProtomux) return stream;
-    return new this(stream);
-  }
-
-  public async createChannel({
-    protocol,
-    id = null,
-    handshake = null,
-    onopen = undefined,
-    onclose = undefined,
-    ondestroy = undefined,
-  }: {
-    protocol: string;
-    id: any;
-    handshake: any;
-    onopen?: Function;
-    onclose?: Function;
-    ondestroy?: Function;
-  }) {
-    return createChannel(
-      this,
-      protocol,
-      id,
-      handshake,
-      onopen,
-      onclose,
-      ondestroy
-    );
-  }
-}
-
-class Channel extends Client {
-  private protocol: string;
-  private id: any;
-  private handshake: any;
-  private onopen?: Function;
-  private onclose?: Function;
-  private ondestroy?: Function;
-  private _ready?: Promise<void>;
-
-  private _send?: (data?: any) => void;
-
-  private _opened = defer();
-
-  private _queue: Message[] = [];
-
-  private _inited = false;
-
-  constructor(
-    mux: Protomux,
-    protocol: string,
-    id: any,
-    handshake: any,
-    onopen?: Function,
-    onclose?: Function,
-    ondestroy?: Function
-  ) {
-    super();
-    this._mux = mux;
-    this.protocol = protocol;
-    this.id = id;
-    this.handshake = handshake;
-    this.onopen = onopen;
-    this.onclose = onclose;
-    this.ondestroy = ondestroy;
-  }
-
-  private _mux: Protomux;
-
-  get mux(): Protomux {
-    return this._mux;
-  }
-
-  private _channelId = -1;
-
-  get channelId(): number {
-    return this._channelId;
-  }
-
-  private async init(): Promise<void> {
-    if (this._inited) {
-      return;
-    }
-
-    this._inited = true;
-
-    const created = defer();
-    const [update, ret] = this.connectModule(
-      "createProtomuxChannel",
-      {
-        id: this._mux.stream.id,
-        data: {
-          protocol: this.protocol,
-          id: this.id,
-          handshake: this.handshake,
-          onopen: !!this.onopen,
-          onclose: !!this.onclose,
-          ondestroy: !!this.ondestroy,
-        },
-      },
-      (data: any) => {
-        switch (data.action) {
-          case "open":
-            this._opened.resolve();
-            break;
-          case "onopen":
-            this.onopen?.(...data.args);
-            break;
-          case "onclose":
-            this.onclose?.(...data.args);
-            break;
-          case "ondestroy":
-            this.ondestroy?.(...data.args);
-            break;
-          default:
-            this._channelId = data;
-            created.resolve();
-        }
-      }
-    );
-    this._send = update;
-
-    ret.catch((e) => created.reject(e));
-
-    this._ready = created.promise as Promise<void>;
-  }
-
-  async open(): Promise<void> {
-    await this.init();
-    await this._ready;
-
-    while (this._queue.length) {
-      await this._queue.shift()?.init();
-    }
-
-    this._send?.({ action: "open" });
-
-    return this._opened.promise as Promise<void>;
-  }
-
-  public addMessage({
-    encoding = undefined,
-    onmessage,
-  }: {
-    encoding?: any;
-    onmessage: Function;
-  }) {
-    return createMessage({ channel: this, encoding, onmessage });
-  }
-
-  public async queueMessage(message: Message) {
-    this._queue.push(message);
-  }
-}
-
-class Message extends Client {
-  private encoding: any;
-  private onmessage: Function;
-  private channel: Channel;
-
-  private _send?: (data?: any) => void;
-
-  constructor({
-    channel,
-    encoding = undefined,
-    onmessage = () => {},
-  }: {
-    channel: Channel;
-    encoding?: any;
-    onmessage: Function;
-  }) {
-    super();
-    this.channel = channel;
-    this.encoding = encoding;
-    this.onmessage = onmessage;
-    this.channel.queueMessage(this);
-  }
-
-  async init(): Promise<void> {
-    const created = defer();
-
-    await this.loadLibs(MODULE);
-
-    const [update] = this.connectModule(
-      "createProtomuxMessage",
-      {
-        id: this.channel.mux.stream.id,
-        channelId: this.channel.channelId,
-        data: {
-          encoding: !!this.encoding,
-          onmessage: !!this.onmessage,
-        },
-      },
-      async (data: any) => {
-        switch (data.action) {
-          case "encode":
-            update({
-              action: "encode",
-              args: [await this.encoding.encode?.(...data.args), data.args[0]],
-            });
-            break;
-          case "decode":
-            update({
-              action: "decode",
-              args: [await this.encoding.decode?.(...data.args), data.args[0]],
-            });
-            break;
-          case "preencode":
-            update({
-              action: "preencode",
-              args: [
-                await this.encoding.preencode?.(...data.args),
-                data.args[0],
-              ],
-            });
-            break;
-          case "onmessage":
-            this.onmessage?.(...data.args);
-            break;
-          case "created":
-            created.resolve();
-            break;
-        }
-      }
-    );
-
-    this._send = update;
-
-    return created.promise as Promise<void>;
-  }
-
-  public send(data: any) {
-    this._send?.({ action: "send", args: [data] });
-  }
-}
-
-const createChannel = factory<Channel>(Channel, MODULE);
-const createMessage = factory<Message>(Message, MODULE);
-
-export = Protomux;