Skip to content

Commit

Permalink
refactor: update deps and regen protos
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Stewart <[email protected]>
  • Loading branch information
paralin committed May 3, 2024
1 parent 1810fab commit 68b93ac
Show file tree
Hide file tree
Showing 95 changed files with 479 additions and 651 deletions.
2 changes: 1 addition & 1 deletion daemon/api/api.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions daemon/api/api.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export type Config = Message<{
busConfig?: Config$1
}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'bifrost.api.Config',
fields: [
Expand Down
2 changes: 1 addition & 1 deletion daemon/api/controller/controller.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 4 additions & 13 deletions daemon/api/controller/controller.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'
import { Config as Config$1 } from '../api.pb.js'
import { Config as Config$2 } from '@go/github.com/aperturerobotics/controllerbus/bus/api/api.pb.js'

Expand Down Expand Up @@ -42,22 +42,13 @@ export type Config = Message<{
busApiConfig?: Config$2
}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'bifrost.api.controller.Config',
fields: [
{
no: 1,
name: 'listen_addr',
kind: 'scalar',
T: 9 /* ScalarType.STRING */,
},
{ no: 1, name: 'listen_addr', kind: 'scalar', T: ScalarType.STRING },
{ no: 2, name: 'api_config', kind: 'message', T: () => Config$1 },
{
no: 3,
name: 'disable_bus_api',
kind: 'scalar',
T: 8 /* ScalarType.BOOL */,
},
{ no: 3, name: 'disable_bus_api', kind: 'scalar', T: ScalarType.BOOL },
{ no: 4, name: 'bus_api_config', kind: 'message', T: () => Config$2 },
] as readonly PartialFieldInfo[],
packedByDefault: true,
Expand Down
2 changes: 1 addition & 1 deletion entitygraph/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions entitygraph/config.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const protobufPackage = 'bifrost.entitygraph'
*/
export type Config = Message<{}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'bifrost.entitygraph.Config',
fields: [] as readonly PartialFieldInfo[],
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ module github.com/aperturerobotics/bifrost
go 1.22

require (
github.com/aperturerobotics/common v0.15.1 // latest
github.com/aperturerobotics/controllerbus v0.44.4 // latest
github.com/aperturerobotics/common v0.15.2 // latest
github.com/aperturerobotics/controllerbus v0.44.5 // latest
github.com/aperturerobotics/entitygraph v0.9.0 // latest
github.com/aperturerobotics/protobuf-go-lite v0.6.1 // latest
github.com/aperturerobotics/starpc v0.32.1 // latest
github.com/aperturerobotics/util v1.22.2-0.20240429204300-8b2d5826595d // master
github.com/aperturerobotics/starpc v0.32.2 // latest
github.com/aperturerobotics/util v1.23.0 // master
)

// aperture: use compatibility forks
Expand Down
26 changes: 8 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ github.com/aperturerobotics/bifrost-nats-client v1.10.1-0.20200831103200-24c3d04
github.com/aperturerobotics/bifrost-nats-client v1.10.1-0.20200831103200-24c3d0464e58/go.mod h1:ougcjYEZDYV8pVtaNbA5sgYDukkYHyKtSsW/T3B13j0=
github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2df0c151f h1:bmScByQNGDPPy9T+zdwu816XaCbFtD5UDyqZMRiHJ80=
github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2df0c151f/go.mod h1:kIcZtLpq4UIZzOqduYLm1mYU1nuMBtN6XuDCtQ21QT8=
github.com/aperturerobotics/common v0.15.0 h1:CA+t6vxhcvkCpxqhpUzwZDbz4u5FjmtaayXYeU2VIEE=
github.com/aperturerobotics/common v0.15.0/go.mod h1:lbKmrcn9sYjn8LsQ+dYOUJ+wjZUCNySsce6+t8r6GFk=
github.com/aperturerobotics/common v0.15.1 h1:ezvq0sNgGlCElxriqMVuIrBMB/OmIJrBaUiwBoi6xz8=
github.com/aperturerobotics/common v0.15.1/go.mod h1:lbKmrcn9sYjn8LsQ+dYOUJ+wjZUCNySsce6+t8r6GFk=
github.com/aperturerobotics/controllerbus v0.44.4 h1:g225CGtl4rGYi5ZJlAa9MwhvBrzJSo3wANcRpLV3rNM=
github.com/aperturerobotics/controllerbus v0.44.4/go.mod h1:cx3BhNMHdKreQY6XUhdtPI+9Gzk9gbqYKsRtAE8ZwmQ=
github.com/aperturerobotics/common v0.15.2 h1:94z85iuQ7/CIH29ECOKKlQ3UQYFrBXNZezGRczV6Ka0=
github.com/aperturerobotics/common v0.15.2/go.mod h1:lbKmrcn9sYjn8LsQ+dYOUJ+wjZUCNySsce6+t8r6GFk=
github.com/aperturerobotics/controllerbus v0.44.5 h1:n5zNx1azwmJFMNsJiEYwyH/0aahWRlEt/BeOXtalDyc=
github.com/aperturerobotics/controllerbus v0.44.5/go.mod h1:qPjW/2nyAfpTHpQV9vtotPDHuBG12YARxj2gGhBP33I=
github.com/aperturerobotics/entitygraph v0.9.0 h1:InXPpXS00IFMJszjKGUrSegHL1dI1nzsH+MAIxGM2fc=
github.com/aperturerobotics/entitygraph v0.9.0/go.mod h1:2dcBYh8siYw0MBjQwtQyg3tvqEval59EfYGM4IDI7h0=
github.com/aperturerobotics/json-iterator-lite v1.0.0 h1:cihbrYWoK/S2RYXhJLpDZd+GUjVvFJN+D3w1VOqqHRI=
Expand All @@ -20,12 +18,10 @@ github.com/aperturerobotics/protobuf-go-lite v0.6.1 h1:dN4baS2e2qHhdpX57RJKUEuks
github.com/aperturerobotics/protobuf-go-lite v0.6.1/go.mod h1:6Bp+C+fI1uh0NmIKpxlxyHMkKtCP9Kb3PHkhOzxG4B8=
github.com/aperturerobotics/quic-go v0.41.1-0.20240125035303-1093432c45e9 h1:QLhCPPV6tnQpbHqJLvU/aOdp9RNajGLDTAwFsKi7Kow=
github.com/aperturerobotics/quic-go v0.41.1-0.20240125035303-1093432c45e9/go.mod h1:tY2LVzdNWloFW0Gbg9bK8L49s4UhyUe9uCZIOF6KtuI=
github.com/aperturerobotics/starpc v0.31.14 h1:uciCrb70MsLVwJIrfoLv0OTezN7QYQ0RJtF3IhIm3ns=
github.com/aperturerobotics/starpc v0.31.14/go.mod h1:O9KeLOIEqrRMxtYioOjKTRvAOGqzqpZ3PbBAswWppJM=
github.com/aperturerobotics/starpc v0.32.1 h1:icq0MgGBmp0an0OODzi5oP4saaZYuUE832k7jrikXrc=
github.com/aperturerobotics/starpc v0.32.1/go.mod h1:O9KeLOIEqrRMxtYioOjKTRvAOGqzqpZ3PbBAswWppJM=
github.com/aperturerobotics/util v1.22.2-0.20240429204300-8b2d5826595d h1:RMsJofnefDuItlP6aN7+BvfgTnJxIiFuvOsIMOIGUzg=
github.com/aperturerobotics/util v1.22.2-0.20240429204300-8b2d5826595d/go.mod h1:b9c3xIwtCfd0DwhfOXB1Tk44uCckcYaB+0z8N17bWIY=
github.com/aperturerobotics/starpc v0.32.2 h1:hl2n0jc1nWs4UFwFuWVDXVaXll151Dy1PC9YG8ZUokM=
github.com/aperturerobotics/starpc v0.32.2/go.mod h1:keQmyg+5JomNuYvokZWXcLHXuojqU7I+VsZMj71HVsA=
github.com/aperturerobotics/util v1.23.0 h1:MW2klko8UN+t1baHiwy0RsEbpz+ZSleSmvZ9M26AQgA=
github.com/aperturerobotics/util v1.23.0/go.mod h1:NaPbGzquoyVaaCLcdxorXjDYrI9Y+FoRNqOfKGUl9EY=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
Expand Down Expand Up @@ -154,8 +150,6 @@ github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNI
github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
github.com/pion/dtls/v2 v2.2.10 h1:u2Axk+FyIR1VFTPurktB+1zoEPGIW3bmyj3LEFrXjAA=
github.com/pion/dtls/v2 v2.2.10/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
github.com/pion/ice/v3 v3.0.6 h1:UC5vZCMhmve7yv+Y6E5eTnRTl+t9LLtmeBYQ9038Zm8=
github.com/pion/ice/v3 v3.0.6/go.mod h1:4eMTUKQEjC1fGQGB6qUzy2ux9Pc1v9EsO3hNaii+kXI=
github.com/pion/ice/v3 v3.0.7 h1:dfMViRKblENqzorR2cQiiRKWqQfqKZ9+nT/sREX3ra8=
github.com/pion/ice/v3 v3.0.7/go.mod h1:pBRcCoJRC0vwvFsemfRIqRLYukV4bPboGb0B4b8AhrQ=
github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M=
Expand Down Expand Up @@ -187,12 +181,8 @@ github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLh
github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
github.com/pion/transport/v3 v3.0.2 h1:r+40RJR25S9w3jbA6/5uEPTzcdn7ncyU44RWCbHkLg4=
github.com/pion/transport/v3 v3.0.2/go.mod h1:nIToODoOlb5If2jF9y2Igfx3PFYWfuXi37m0IlWa/D0=
github.com/pion/turn/v3 v3.0.2 h1:iBonAIIKRwkVUJBFiFd/kSjytP7FlX0HwCyBDJPRDdU=
github.com/pion/turn/v3 v3.0.2/go.mod h1:vw0Dz420q7VYAF3J4wJKzReLHIo2LGp4ev8nXQexYsc=
github.com/pion/turn/v3 v3.0.3 h1:1e3GVk8gHZLPBA5LqadWYV60lmaKUaHCkm9DX9CkGcE=
github.com/pion/turn/v3 v3.0.3/go.mod h1:vw0Dz420q7VYAF3J4wJKzReLHIo2LGp4ev8nXQexYsc=
github.com/pion/webrtc/v4 v4.0.0-beta.18 h1:qCT7RrVomRu5LBxeoWz8WuJyD8Xt7AxXcJlj81/v4ik=
github.com/pion/webrtc/v4 v4.0.0-beta.18/go.mod h1:S9LRG5LIld++K8jfPIlS40EmVVdXuotwEXSp20r+KPs=
github.com/pion/webrtc/v4 v4.0.0-beta.19 h1:qAmESbOR4C8Odv+FjGc7qS1sqhWAZJgmSjQFu8pahI8=
github.com/pion/webrtc/v4 v4.0.0-beta.19/go.mod h1:yL80J6f59xyNERWAJXFdKZjjQXR4NchgtXr5JDA/2uQ=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
2 changes: 1 addition & 1 deletion hash/hash.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion hash/hash.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
createEnumType,
createMessageType,
Message,
ScalarType,
} from '@aptre/protobuf-es-lite'

export const protobufPackage = 'hash'
Expand Down Expand Up @@ -76,11 +77,12 @@ export type Hash = Message<{
hash?: Uint8Array
}>

// Hash contains the message type declaration for Hash.
export const Hash: MessageType<Hash> = createMessageType({
typeName: 'hash.Hash',
fields: [
{ no: 1, name: 'hash_type', kind: 'enum', T: HashType_Enum },
{ no: 2, name: 'hash', kind: 'scalar', T: 12 /* ScalarType.BYTES */ },
{ no: 2, name: 'hash', kind: 'scalar', T: ScalarType.BYTES },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
2 changes: 1 addition & 1 deletion http/listener/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions http/listener/config.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'

export const protobufPackage = 'bifrost.http.listener'

Expand Down Expand Up @@ -53,14 +53,15 @@ export type Config = Message<{
wait?: boolean
}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'bifrost.http.listener.Config',
fields: [
{ no: 1, name: 'addr', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 2, name: 'client_id', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 3, name: 'cert_file', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 4, name: 'key_file', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 5, name: 'wait', kind: 'scalar', T: 8 /* ScalarType.BOOL */ },
{ no: 1, name: 'addr', kind: 'scalar', T: ScalarType.STRING },
{ no: 2, name: 'client_id', kind: 'scalar', T: ScalarType.STRING },
{ no: 3, name: 'cert_file', kind: 'scalar', T: ScalarType.STRING },
{ no: 4, name: 'key_file', kind: 'scalar', T: ScalarType.STRING },
{ no: 5, name: 'wait', kind: 'scalar', T: ScalarType.BOOL },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
2 changes: 1 addition & 1 deletion link/establish/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions link/establish/config.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'

export const protobufPackage = 'link.establish.controller'

Expand All @@ -29,22 +29,18 @@ export type Config = Message<{
srcPeerId?: string
}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'link.establish.controller.Config',
fields: [
{
no: 1,
name: 'peer_ids',
kind: 'scalar',
T: 9 /* ScalarType.STRING */,
T: ScalarType.STRING,
repeated: true,
},
{
no: 2,
name: 'src_peer_id',
kind: 'scalar',
T: 9 /* ScalarType.STRING */,
},
{ no: 2, name: 'src_peer_id', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
2 changes: 1 addition & 1 deletion link/hold-open/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions link/hold-open/config.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const protobufPackage = 'link.holdopen.controller'
*/
export type Config = Message<{}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'link.holdopen.controller.Config',
fields: [] as readonly PartialFieldInfo[],
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
"singleQuote": true
},
"devDependencies": {
"@aptre/common": "^0.15.0",
"@aptre/common": "^0.15.2",
"depcheck": "^1.4.6",
"prettier": "^3.1.1",
"rimraf": "^5.0.5",
"typescript": "^5.4.4"
},
"dependencies": {
"@aptre/protobuf-es-lite": "^0.4.0",
"starpc": "^0.32.0"
"@aptre/protobuf-es-lite": "^0.4.3",
"starpc": "^0.32.2"
},
"resolutions": {
"@aptre/protobuf-es-lite": "0.4.3"
Expand Down
2 changes: 1 addition & 1 deletion peer/api/api.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions peer/api/api.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'
import { Config } from '../controller/config.pb.js'
import type { ControllerStatus } from '@go/github.com/aperturerobotics/controllerbus/controller/exec/exec.pb.js'
import { ControllerStatus_Enum } from '@go/github.com/aperturerobotics/controllerbus/controller/exec/exec.pb.js'
Expand All @@ -24,6 +24,7 @@ export type IdentifyRequest = Message<{
config?: Config
}>

// IdentifyRequest contains the message type declaration for IdentifyRequest.
export const IdentifyRequest: MessageType<IdentifyRequest> = createMessageType({
typeName: 'peer.api.IdentifyRequest',
fields: [
Expand All @@ -46,6 +47,7 @@ export type IdentifyResponse = Message<{
controllerStatus?: ControllerStatus
}>

// IdentifyResponse contains the message type declaration for IdentifyResponse.
export const IdentifyResponse: MessageType<IdentifyResponse> =
createMessageType({
typeName: 'peer.api.IdentifyResponse',
Expand Down Expand Up @@ -74,11 +76,12 @@ export type GetPeerInfoRequest = Message<{
peerId?: string
}>

// GetPeerInfoRequest contains the message type declaration for GetPeerInfoRequest.
export const GetPeerInfoRequest: MessageType<GetPeerInfoRequest> =
createMessageType({
typeName: 'peer.api.GetPeerInfoRequest',
fields: [
{ no: 1, name: 'peer_id', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 1, name: 'peer_id', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
Expand All @@ -97,10 +100,11 @@ export type PeerInfo = Message<{
peerId?: string
}>

// PeerInfo contains the message type declaration for PeerInfo.
export const PeerInfo: MessageType<PeerInfo> = createMessageType({
typeName: 'peer.api.PeerInfo',
fields: [
{ no: 1, name: 'peer_id', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 1, name: 'peer_id', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
Expand All @@ -119,6 +123,7 @@ export type GetPeerInfoResponse = Message<{
localPeers?: PeerInfo[]
}>

// GetPeerInfoResponse contains the message type declaration for GetPeerInfoResponse.
export const GetPeerInfoResponse: MessageType<GetPeerInfoResponse> =
createMessageType({
typeName: 'peer.api.GetPeerInfoResponse',
Expand Down
2 changes: 1 addition & 1 deletion peer/api/api_srpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion peer/controller/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions peer/controller/config.pb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* eslint-disable */

import type { MessageType, PartialFieldInfo } from '@aptre/protobuf-es-lite'
import { createMessageType, Message } from '@aptre/protobuf-es-lite'
import { createMessageType, Message, ScalarType } from '@aptre/protobuf-es-lite'

export const protobufPackage = 'peer.controller'

Expand Down Expand Up @@ -38,12 +38,13 @@ export type Config = Message<{
peerId?: string
}>

// Config contains the message type declaration for Config.
export const Config: MessageType<Config> = createMessageType({
typeName: 'peer.controller.Config',
fields: [
{ no: 1, name: 'priv_key', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 2, name: 'pub_key', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 3, name: 'peer_id', kind: 'scalar', T: 9 /* ScalarType.STRING */ },
{ no: 1, name: 'priv_key', kind: 'scalar', T: ScalarType.STRING },
{ no: 2, name: 'pub_key', kind: 'scalar', T: ScalarType.STRING },
{ no: 3, name: 'peer_id', kind: 'scalar', T: ScalarType.STRING },
] as readonly PartialFieldInfo[],
packedByDefault: true,
})
Loading

0 comments on commit 68b93ac

Please sign in to comment.