diff --git a/client/AdriftClient.ts b/client/AdriftClient.ts index 3afc7e8..c8d979f 100644 --- a/client/AdriftClient.ts +++ b/client/AdriftClient.ts @@ -1,7 +1,13 @@ - +import { + BareHeaders, + BareResponse, + Client, + GetRequestHeadersCallback, + MetaCallback, + ReadyStateCallback, + WebSocketImpl, +} from "bare-client-custom"; import Connection from "./Connection"; -import { BareClient as BareClientCustom, registerRemoteListener, setBareClientImplementation, Client, GetRequestHeadersCallback, MetaCallback, ReadyStateCallback, WebSocketImpl, BareHeaders, BareResponse } from "bare-client-custom"; - // export class Adrift { // bareclient:AdriftBareClient, @@ -14,12 +20,25 @@ export class AdriftBareClient extends Client { constructor(private connection: Connection) { super(); } - async request(method: string, requestHeaders: BareHeaders, body: BodyInit | null, remote: URL, cache: string | undefined, duplex: string | undefined, signal: AbortSignal | undefined): Promise { + async request( + method: string, + requestHeaders: BareHeaders, + body: BodyInit | null, + remote: URL, + cache: string | undefined, + duplex: string | undefined, + signal: AbortSignal | undefined + ): Promise { let rawResponse = await this.connection.httprequest({ a: "test data" }); return new Response(JSON.stringify(rawResponse)) as BareResponse; } - async connect(remote: URL, protocols: string[], getRequestHeaders: GetRequestHeadersCallback, onMeta: MetaCallback, onReadyState: ReadyStateCallback, webSocketImpl: WebSocketImpl): WebSocket { - - } + async connect( + remote: URL, + protocols: string[], + getRequestHeaders: GetRequestHeadersCallback, + onMeta: MetaCallback, + onReadyState: ReadyStateCallback, + webSocketImpl: WebSocketImpl + ): WebSocket {} } diff --git a/client/App.tsx b/client/App.tsx index 9a5a9bf..0201b24 100644 --- a/client/App.tsx +++ b/client/App.tsx @@ -1,30 +1,44 @@ +import { + registerRemoteListener, + setBareClientImplementation, +} from "bare-client-custom"; import { Component, Fragment, h, render } from "preact"; import { RTCTransport } from "./RTCTransport"; +import "./firebase"; const _ = [h, render, Component, Fragment]; -import "./firebase"; -import { BareClient as BareClientCustom, registerRemoteListener, setBareClientImplementation, Client, GetRequestHeadersCallback, MetaCallback, ReadyStateCallback, WebSocketImpl, BareHeaders, BareResponse } from "bare-client-custom"; -import { createBareClient } from "@tomphttp/bare-client"; import { AdriftBareClient } from "./AdriftClient"; import Connection from "./Connection"; +import { DevWsTransport } from "./DevWsTransport"; -let rtc = new RTCTransport( - console.log, - () => { - // rtc.dataChannel.send("test message"); +const rtcEnable = false; +let rtc; +let connection; +if (rtcEnable) { + rtc = new RTCTransport( + console.log, + () => { + // rtc.dataChannel.send("test message"); + // let client = new AdriftBareClient; + // setBareClientImplementation(client); + // + }, + console.log, + console.log, + console.log + ); + connection = new Connection(rtc); +} else { + connection = new Connection( + new DevWsTransport( + () => console.log("onopen"), + () => console.log("onclose") + ) + ); +} - // let client = new AdriftBareClient; - // setBareClientImplementation(client); - // - - }, - console.log, - console.log, - console.log -); -let connection = new Connection(rtc); window["co"] = connection; // connection.httprequest({ a: 1, b: 2 }); @@ -32,7 +46,6 @@ let bare = new AdriftBareClient(connection); setBareClientImplementation(bare); registerRemoteListener(); - export default class App extends Component { rtc = rtc; @@ -50,21 +63,23 @@ export default class App extends Component {