Get rid of ts flatbuffer namespaces.
They aren't really required and complicate imports.
Change-Id: I4fa401bb58a84563553236b18042dade9b16ad8d
diff --git a/aos/BUILD b/aos/BUILD
index 47de872..4936da4 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -1,5 +1,5 @@
load("//tools:environments.bzl", "mcu_cpus")
-load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library", "flatbuffer_py_library")
+load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library", "flatbuffer_py_library", "flatbuffer_ts_library")
filegroup(
name = "prime_binaries",
@@ -287,6 +287,12 @@
visibility = ["//visibility:public"],
)
+flatbuffer_ts_library(
+ name = "configuration_ts_fbs",
+ srcs = ["configuration.fbs"],
+ visibility = ["//visibility:public"],
+)
+
flatbuffer_py_library(
name = "configuration_fbs_python",
srcs = ["configuration.fbs"],
diff --git a/aos/network/BUILD b/aos/network/BUILD
index 96d561f..89853f0 100644
--- a/aos/network/BUILD
+++ b/aos/network/BUILD
@@ -13,6 +13,14 @@
],
)
+flatbuffer_ts_library(
+ name = "connect_ts_fbs",
+ srcs = ["connect.fbs"],
+ includes = [
+ "//aos:configuration_fbs_includes",
+ ],
+)
+
flatbuffer_cc_library(
name = "timestamp_fbs",
srcs = ["timestamp.fbs"],
diff --git a/aos/network/www/BUILD b/aos/network/www/BUILD
index 76e8ef4..bab5198 100644
--- a/aos/network/www/BUILD
+++ b/aos/network/www/BUILD
@@ -18,6 +18,8 @@
],
deps = [
"//aos/network:web_proxy_ts_fbs",
+ "//aos/network:connect_ts_fbs",
+ "//aos:configuration_ts_fbs",
],
visibility=["//visibility:public"],
)
diff --git a/aos/network/www/config_handler.ts b/aos/network/www/config_handler.ts
index 0af78b6..aed3315 100644
--- a/aos/network/www/config_handler.ts
+++ b/aos/network/www/config_handler.ts
@@ -1,10 +1,11 @@
-import {aos} from 'aos/network/web_proxy_generated';
+import {Configuration, Channel} from 'aos/configuration_generated';
+import {Connect} from 'aos/network/connect_generated';
export class ConfigHandler {
private readonly root_div = document.getElementById('config');
constructor(
- private readonly config: aos.Configuration,
+ private readonly config: Configuration,
private readonly dataChannel: RTCDataChannel) {}
printConfig() {
@@ -46,19 +47,19 @@
const channel = this.config.channels(index);
const namefb = builder.createString(channel.name());
const typefb = builder.createString(channel.type());
- aos.Channel.startChannel(builder);
- aos.Channel.addName(builder, namefb);
- aos.Channel.addType(builder, typefb);
- const channelfb = aos.Channel.endChannel(builder);
+ Channel.startChannel(builder);
+ Channel.addName(builder, namefb);
+ Channel.addType(builder, typefb);
+ const channelfb = Channel.endChannel(builder);
channels.push(channelfb);
}
const channelsfb =
- aos.message_bridge.Connect.createChannelsToTransferVector(
+ Connect.createChannelsToTransferVector(
builder, channels);
- aos.message_bridge.Connect.startConnect(builder);
- aos.message_bridge.Connect.addChannelsToTransfer(builder, channelsfb);
- const connect = aos.message_bridge.Connect.endConnect(builder);
+ Connect.startConnect(builder);
+ Connect.addChannelsToTransfer(builder, channelsfb);
+ const connect = Connect.endConnect(builder);
builder.finish(connect);
const array = builder.asUint8Array();
console.log('connect', array);
diff --git a/aos/network/www/ping_handler.ts b/aos/network/www/ping_handler.ts
index 9b37d70..df7635d 100644
--- a/aos/network/www/ping_handler.ts
+++ b/aos/network/www/ping_handler.ts
@@ -1,8 +1,8 @@
-import {aos} from 'aos/events/ping_generated';
+import {Ping} from 'aos/events/ping_generated';
export function HandlePing(data: Uint8Array) {
const fbBuffer = new flatbuffers.ByteBuffer(data);
- const ping = aos.examples.Ping.getRootAsPing(fbBuffer);
+ const ping = Ping.getRootAsPing(fbBuffer);
document.getElementById('val').innerHTML = ping.value();
document.getElementById('time').innerHTML = ping.sendTime().low;
diff --git a/aos/network/www/proxy.ts b/aos/network/www/proxy.ts
index 27ffbfe..80c71b2 100644
--- a/aos/network/www/proxy.ts
+++ b/aos/network/www/proxy.ts
@@ -1,5 +1,5 @@
-import {aos} from 'aos/network/web_proxy_generated';
import {ConfigHandler} from './config_handler';
+import {Configuration} from 'aos/configuration_generated';
// There is one handler for each DataChannel, it maintains the state of
// multi-part messages and delegates to a callback when the message is fully
@@ -16,7 +16,7 @@
handleMessage(e: MessageEvent): void {
const fbBuffer = new flatbuffers.ByteBuffer(new Uint8Array(e.data));
const messageHeader =
- aos.web_proxy.MessageHeader.getRootAsMessageHeader(fbBuffer);
+ WebProxy.MessageHeader.getRootAsMessageHeader(fbBuffer);
// Short circuit if only one packet
if (messageHeader.packetCount === 1) {
this.handlerFunc(messageHeader.dataArray());
@@ -44,8 +44,8 @@
private rtcPeerConnection: RTCPeerConnection|null = null;
private dataChannel: DataChannel|null = null;
private webSocketUrl: string;
- private configHandler: ConfigHandler|null =
- null private config: aos.Configuration|null = null;
+ private configHandler: ConfigHandler|null = null;
+ private config: Configuration|null = null;
private readonly handlerFuncs = new Map<string, (data: Uint8Array) => void>();
private readonly handlers = new Set<Handler>();
@@ -98,10 +98,10 @@
const candidateString = builder.createString(candidate.candidate);
const sdpMidString = builder.createString(candidate.sdpMid);
- const iceFb = aos.web_proxy.WebSocketIce.createWebSocketIce(
+ const iceFb = WebProxy.WebSocketIce.createWebSocketIce(
builder, candidateString, sdpMidString, candidate.sdpMLineIndex);
- const messageFb = aos.web_proxy.WebSocketMessage.createWebSocketMessage(
- builder, aos.web_proxy.Payload.WebSocketIce, iceFb);
+ const messageFb = WebProxy.WebSocketMessage.createWebSocketMessage(
+ builder, WebProxy.Payload.WebSocketIce, iceFb);
builder.finish(messageFb);
const array = builder.asUint8Array();
this.webSocketConnection.send(array.buffer.slice(array.byteOffset));
@@ -113,10 +113,10 @@
const builder = new flatbuffers.Builder(512);
const offerString = builder.createString(description.sdp);
- const webSocketSdp = aos.web_proxy.WebSocketSdp.createWebSocketSdp(
- builder, aos.web_proxy.SdpType.OFFER, offerString);
- const message = aos.web_proxy.WebSocketMessage.createWebSocketMessage(
- builder, aos.web_proxy.Payload.WebSocketSdp, webSocketSdp);
+ const webSocketSdp = WebProxy.WebSocketSdp.createWebSocketSdp(
+ builder, WebProxy.SdpType.OFFER, offerString);
+ const message = WebProxy.WebSocketMessage.createWebSocketMessage(
+ builder, WebProxy.Payload.WebSocketSdp, webSocketSdp);
builder.finish(message);
const array = builder.asUint8Array();
this.webSocketConnection.send(array.buffer.slice(array.byteOffset));
@@ -145,19 +145,19 @@
const buffer = new Uint8Array(e.data)
const fbBuffer = new flatbuffers.ByteBuffer(buffer);
const message =
- aos.web_proxy.WebSocketMessage.getRootAsWebSocketMessage(fbBuffer);
+ WebProxy.WebSocketMessage.getRootAsWebSocketMessage(fbBuffer);
switch (message.payloadType()) {
- case aos.web_proxy.Payload.WebSocketSdp:
- const sdpFb = message.payload(new aos.web_proxy.WebSocketSdp());
- if (sdpFb.type() !== aos.web_proxy.SdpType.ANSWER) {
+ case WebProxy.Payload.WebSocketSdp:
+ const sdpFb = message.payload(new WebProxy.WebSocketSdp());
+ if (sdpFb.type() !== WebProxy.SdpType.ANSWER) {
console.log('got something other than an answer back');
break;
}
this.rtcPeerConnection.setRemoteDescription(new RTCSessionDescription(
{'type': 'answer', 'sdp': sdpFb.payload()}));
break;
- case aos.web_proxy.Payload.WebSocketIce:
- const iceFb = message.payload(new aos.web_proxy.WebSocketIce());
+ case WebProxy.Payload.WebSocketIce:
+ const iceFb = message.payload(new WebProxy.WebSocketIce());
const candidate = {} as RTCIceCandidateInit;
candidate.candidate = iceFb.candidate();
candidate.sdpMid = iceFb.sdpMid();