Skip to content

Commit c2b2121

Browse files
author
temur abdurahmanov
committed
init types and swagger
1 parent e07bed0 commit c2b2121

13 files changed

+107
-102
lines changed

‎pkg/api/types/game_settings.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
)
77

88
type CreateRoomRequest struct {
9-
RoomTTl time.Duration
9+
RoomTTl time.Duration `json:"roomTTl"`
1010
}
1111

1212
type GetDeletedRooms struct {
13-
GameID uuid.UUID
14-
RoomID uuid.UUID
13+
GameID uuid.UUID `json:"gameID"`
14+
RoomID uuid.UUID `json:"roomID"`
1515
}

‎pkg/clients/udpGameServer/serversettings-exchange.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// GENERATED BY 'T'ransport 'G'enerator. DO NOT EDIT.
22
package udpGameServer
33

4-
import (
5-
"github.com/ascenmmo/udp-server/pkg/api/types"
6-
"github.com/google/uuid"
7-
)
4+
import "github.com/ascenmmo/udp-server/pkg/api/types"
85

96
type requestServerSettingsGetConnectionsNum struct {
107
Token string `json:"token"`
@@ -39,11 +36,11 @@ type requestServerSettingsCreateRoom struct {
3936
// Formal exchange type, please do not delete.
4037
type responseServerSettingsCreateRoom struct{}
4138

42-
type requestServerSettingsSetNotifyServer struct {
43-
Token string `json:"token"`
44-
Id uuid.UUID `json:"id"`
45-
Url string `json:"url"`
39+
type requestServerSettingsGetDeletedRooms struct {
40+
Token string `json:"token"`
41+
Ids []types.GetDeletedRooms `json:"ids"`
4642
}
4743

48-
// Formal exchange type, please do not delete.
49-
type responseServerSettingsSetNotifyServer struct{}
44+
type responseServerSettingsGetDeletedRooms struct {
45+
DeletedIds []types.GetDeletedRooms `json:"deletedIds"`
46+
}

‎pkg/clients/udpGameServer/serversettings-fallback.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ type fallbackServerSettings interface {
66
HealthCheck(err error) bool
77
GetServerSettings(err error) bool
88
CreateRoom(err error) bool
9-
SetNotifyServer(err error) bool
9+
GetDeletedRooms(err error) bool
1010
}

‎pkg/clients/udpGameServer/serversettings-jsonrpc.go

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/ascenmmo/udp-server/pkg/api/types"
88
"github.com/ascenmmo/udp-server/pkg/clients/udpGameServer/hasher"
99
"github.com/ascenmmo/udp-server/pkg/clients/udpGameServer/jsonrpc"
10-
"github.com/google/uuid"
1110
)
1211

1312
type ClientServerSettings struct {
@@ -18,7 +17,7 @@ type retServerSettingsGetConnectionsNum = func(countConn int, exists bool, err e
1817
type retServerSettingsHealthCheck = func(exists bool, err error)
1918
type retServerSettingsGetServerSettings = func(settings types.Settings, err error)
2019
type retServerSettingsCreateRoom = func(err error)
21-
type retServerSettingsSetNotifyServer = func(err error)
20+
type retServerSettingsGetDeletedRooms = func(deletedIds []types.GetDeletedRooms, err error)
2221

2322
func (cli *ClientServerSettings) GetConnectionsNum(ctx context.Context, token string) (countConn int, exists bool, err error) {
2423

@@ -238,20 +237,19 @@ func (cli *ClientServerSettings) ReqCreateRoom(ctx context.Context, callback ret
238237
return
239238
}
240239

241-
func (cli *ClientServerSettings) SetNotifyServer(ctx context.Context, token string, id uuid.UUID, url string) (err error) {
240+
func (cli *ClientServerSettings) GetDeletedRooms(token string, ids []types.GetDeletedRooms) (deletedIds []types.GetDeletedRooms, err error) {
242241

243-
request := requestServerSettingsSetNotifyServer{
244-
Id: id,
242+
request := requestServerSettingsGetDeletedRooms{
243+
Ids: ids,
245244
Token: token,
246-
Url: url,
247245
}
248-
var response responseServerSettingsSetNotifyServer
246+
var response responseServerSettingsGetDeletedRooms
249247
var rpcResponse *jsonrpc.ResponseRPC
250248
cacheKey, _ := hasher.Hash(request)
251-
rpcResponse, err = cli.rpc.Call(ctx, "serversettings.setnotifyserver", request)
249+
rpcResponse, err = cli.rpc.Call(ctx, "serversettings.getdeletedrooms", request)
252250
var fallbackCheck func(error) bool
253251
if cli.fallbackServerSettings != nil {
254-
fallbackCheck = cli.fallbackServerSettings.SetNotifyServer
252+
fallbackCheck = cli.fallbackServerSettings.GetDeletedRooms
255253
}
256254
if rpcResponse != nil && rpcResponse.Error != nil {
257255
if cli.errorDecoder != nil {
@@ -263,28 +261,27 @@ func (cli *ClientServerSettings) SetNotifyServer(ctx context.Context, token stri
263261
if err = cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response); err != nil {
264262
return
265263
}
266-
return err
264+
return response.DeletedIds, err
267265
}
268266

269-
func (cli *ClientServerSettings) ReqSetNotifyServer(ctx context.Context, callback retServerSettingsSetNotifyServer, token string, id uuid.UUID, url string) (request RequestRPC) {
267+
func (cli *ClientServerSettings) ReqGetDeletedRooms(ctx context.Context, callback retServerSettingsGetDeletedRooms, token string, ids []types.GetDeletedRooms) (request RequestRPC) {
270268

271269
request = RequestRPC{rpcRequest: &jsonrpc.RequestRPC{
272270
ID: jsonrpc.NewID(),
273271
JSONRPC: jsonrpc.Version,
274-
Method: "serversettings.setnotifyserver",
275-
Params: requestServerSettingsSetNotifyServer{
276-
Id: id,
272+
Method: "serversettings.getdeletedrooms",
273+
Params: requestServerSettingsGetDeletedRooms{
274+
Ids: ids,
277275
Token: token,
278-
Url: url,
279276
},
280277
}}
281278
if callback != nil {
282-
var response responseServerSettingsSetNotifyServer
279+
var response responseServerSettingsGetDeletedRooms
283280
request.retHandler = func(err error, rpcResponse *jsonrpc.ResponseRPC) {
284281
cacheKey, _ := hasher.Hash(request.rpcRequest.Params)
285282
var fallbackCheck func(error) bool
286283
if cli.fallbackServerSettings != nil {
287-
fallbackCheck = cli.fallbackServerSettings.SetNotifyServer
284+
fallbackCheck = cli.fallbackServerSettings.GetDeletedRooms
288285
}
289286
if rpcResponse != nil && rpcResponse.Error != nil {
290287
if cli.errorDecoder != nil {
@@ -293,7 +290,7 @@ func (cli *ClientServerSettings) ReqSetNotifyServer(ctx context.Context, callbac
293290
err = fmt.Errorf(rpcResponse.Error.Message)
294291
}
295292
}
296-
callback(cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response))
293+
callback(response.DeletedIds, cli.proceedResponse(ctx, err, cacheKey, fallbackCheck, rpcResponse, &response))
297294
}
298295
}
299296
return

‎pkg/swagger.yaml

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ paths:
148148
jsonrpc:
149149
type: string
150150
example: "2.0"
151-
/api/v1/udp/serverSettings/getServerSettings:
151+
/api/v1/udp/serverSettings/getDeletedRooms:
152152
post:
153153
tags:
154154
- ServerSettings
155-
summary: GetServerSettings
155+
summary: SetNotifyServer
156156
parameters:
157157
- in: header
158158
name: Token
@@ -175,7 +175,7 @@ paths:
175175
type: string
176176
example: "2.0"
177177
params:
178-
$ref: '#/components/schemas/requestServerSettingsGetServerSettings'
178+
$ref: '#/components/schemas/requestServerSettingsGetDeletedRooms'
179179
responses:
180180
"200":
181181
description: Successful operation
@@ -195,7 +195,7 @@ paths:
195195
type: string
196196
example: "2.0"
197197
result:
198-
$ref: '#/components/schemas/responseServerSettingsGetServerSettings'
198+
$ref: '#/components/schemas/responseServerSettingsGetDeletedRooms'
199199
- type: object
200200
properties:
201201
error:
@@ -221,11 +221,11 @@ paths:
221221
jsonrpc:
222222
type: string
223223
example: "2.0"
224-
/api/v1/udp/serverSettings/healthCheck:
224+
/api/v1/udp/serverSettings/getServerSettings:
225225
post:
226226
tags:
227227
- ServerSettings
228-
summary: HealthCheck
228+
summary: GetServerSettings
229229
parameters:
230230
- in: header
231231
name: Token
@@ -248,7 +248,7 @@ paths:
248248
type: string
249249
example: "2.0"
250250
params:
251-
$ref: '#/components/schemas/requestServerSettingsHealthCheck'
251+
$ref: '#/components/schemas/requestServerSettingsGetServerSettings'
252252
responses:
253253
"200":
254254
description: Successful operation
@@ -268,7 +268,7 @@ paths:
268268
type: string
269269
example: "2.0"
270270
result:
271-
$ref: '#/components/schemas/responseServerSettingsHealthCheck'
271+
$ref: '#/components/schemas/responseServerSettingsGetServerSettings'
272272
- type: object
273273
properties:
274274
error:
@@ -294,11 +294,11 @@ paths:
294294
jsonrpc:
295295
type: string
296296
example: "2.0"
297-
/api/v1/udp/serverSettings/setNotifyServer:
297+
/api/v1/udp/serverSettings/healthCheck:
298298
post:
299299
tags:
300300
- ServerSettings
301-
summary: SetNotifyServer
301+
summary: HealthCheck
302302
parameters:
303303
- in: header
304304
name: Token
@@ -321,7 +321,7 @@ paths:
321321
type: string
322322
example: "2.0"
323323
params:
324-
$ref: '#/components/schemas/requestServerSettingsSetNotifyServer'
324+
$ref: '#/components/schemas/requestServerSettingsHealthCheck'
325325
responses:
326326
"200":
327327
description: Successful operation
@@ -341,7 +341,7 @@ paths:
341341
type: string
342342
example: "2.0"
343343
result:
344-
$ref: '#/components/schemas/responseServerSettingsSetNotifyServer'
344+
$ref: '#/components/schemas/responseServerSettingsHealthCheck'
345345
- type: object
346346
properties:
347347
error:
@@ -376,18 +376,18 @@ components:
376376
$ref: '#/components/schemas/types.CreateRoomRequest'
377377
requestServerSettingsGetConnectionsNum:
378378
type: object
379+
requestServerSettingsGetDeletedRooms:
380+
type: object
381+
properties:
382+
ids:
383+
type: array
384+
items:
385+
$ref: '#/components/schemas/types.GetDeletedRooms'
386+
nullable: true
379387
requestServerSettingsGetServerSettings:
380388
type: object
381389
requestServerSettingsHealthCheck:
382390
type: object
383-
requestServerSettingsSetNotifyServer:
384-
type: object
385-
properties:
386-
id:
387-
type: string
388-
format: uuid
389-
url:
390-
type: string
391391
responseServerSettingsCreateRoom:
392392
type: object
393393
responseServerSettingsGetConnectionsNum:
@@ -398,6 +398,14 @@ components:
398398
format: int
399399
exists:
400400
type: boolean
401+
responseServerSettingsGetDeletedRooms:
402+
type: object
403+
properties:
404+
deletedIds:
405+
type: array
406+
items:
407+
$ref: '#/components/schemas/types.GetDeletedRooms'
408+
nullable: true
401409
responseServerSettingsGetServerSettings:
402410
type: object
403411
properties:
@@ -408,10 +416,21 @@ components:
408416
properties:
409417
exists:
410418
type: boolean
411-
responseServerSettingsSetNotifyServer:
412-
type: object
413419
types.CreateRoomRequest:
414420
type: object
421+
properties:
422+
roomTTl:
423+
type: number
424+
format: int64
425+
types.GetDeletedRooms:
426+
type: object
427+
properties:
428+
gameID:
429+
type: string
430+
format: uuid
431+
roomID:
432+
type: string
433+
format: uuid
415434
types.Settings:
416435
type: object
417436
properties:

‎pkg/transport/jsonrpc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ func (srv *Server) doSingleBatch(ctx *fiber.Ctx, request baseJsonRPC) (response
150150
return srv.httpServerSettings.getServerSettings(ctx, request)
151151
case "serversettings.createroom":
152152
return srv.httpServerSettings.createRoom(ctx, request)
153-
case "serversettings.setnotifyserver":
154-
return srv.httpServerSettings.setNotifyServer(ctx, request)
153+
case "serversettings.getdeletedrooms":
154+
return srv.httpServerSettings.getDeletedRooms(ctx, request)
155155
default:
156156
ext.Error.Set(span, true)
157157
span.SetTag("msg", "invalid method '"+methodNameOrigin+"'")

‎pkg/transport/serversettings-exchange.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
// GENERATED BY 'T'ransport 'G'enerator. DO NOT EDIT.
22
package transport
33

4-
import (
5-
"github.com/ascenmmo/udp-server/pkg/api/types"
6-
"github.com/google/uuid"
7-
)
4+
import "github.com/ascenmmo/udp-server/pkg/api/types"
85

96
type requestServerSettingsGetConnectionsNum struct {
107
Token string `json:"token"`
@@ -39,11 +36,11 @@ type requestServerSettingsCreateRoom struct {
3936
// Formal exchange type, please do not delete.
4037
type responseServerSettingsCreateRoom struct{}
4138

42-
type requestServerSettingsSetNotifyServer struct {
43-
Token string `json:"token"`
44-
Id uuid.UUID `json:"id"`
45-
Url string `json:"url"`
39+
type requestServerSettingsGetDeletedRooms struct {
40+
Token string `json:"token"`
41+
Ids []types.GetDeletedRooms `json:"ids"`
4642
}
4743

48-
// Formal exchange type, please do not delete.
49-
type responseServerSettingsSetNotifyServer struct{}
44+
type responseServerSettingsGetDeletedRooms struct {
45+
DeletedIds []types.GetDeletedRooms `json:"deletedIds"`
46+
}

‎pkg/transport/serversettings-http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ func (http *httpServerSettings) SetRoutes(route *fiber.App) {
4848
route.Post("/api/v1/udp/serverSettings/healthCheck", http.serveHealthCheck)
4949
route.Post("/api/v1/udp/serverSettings/getServerSettings", http.serveGetServerSettings)
5050
route.Post("/api/v1/udp/serverSettings/createRoom", http.serveCreateRoom)
51-
route.Post("/api/v1/udp/serverSettings/setNotifyServer", http.serveSetNotifyServer)
51+
route.Post("/api/v1/udp/serverSettings/getDeletedRooms", http.serveGetDeletedRooms)
5252
}

‎pkg/transport/serversettings-jsonrpc.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,17 @@ func (http *httpServerSettings) createRoom(ctx *fiber.Ctx, requestBase baseJsonR
238238
}
239239
return
240240
}
241-
func (http *httpServerSettings) serveSetNotifyServer(ctx *fiber.Ctx) (err error) {
242-
return http.serveMethod(ctx, "setnotifyserver", http.setNotifyServer)
241+
func (http *httpServerSettings) serveGetDeletedRooms(ctx *fiber.Ctx) (err error) {
242+
return http.serveMethod(ctx, "getdeletedrooms", http.getDeletedRooms)
243243
}
244-
func (http *httpServerSettings) setNotifyServer(ctx *fiber.Ctx, requestBase baseJsonRPC) (responseBase *baseJsonRPC) {
244+
func (http *httpServerSettings) getDeletedRooms(ctx *fiber.Ctx, requestBase baseJsonRPC) (responseBase *baseJsonRPC) {
245245

246246
var err error
247-
var request requestServerSettingsSetNotifyServer
247+
var request requestServerSettingsGetDeletedRooms
248248

249249
methodCtx := ctx.UserContext()
250250
span := otg.SpanFromContext(methodCtx)
251-
span.SetTag("method", "setNotifyServer")
251+
span.SetTag("method", "getDeletedRooms")
252252

253253
if requestBase.Params != nil {
254254
if err = json.Unmarshal(requestBase.Params, &request); err != nil {
@@ -269,8 +269,8 @@ func (http *httpServerSettings) setNotifyServer(ctx *fiber.Ctx, requestBase base
269269
request.Token = token
270270
}
271271

272-
var response responseServerSettingsSetNotifyServer
273-
err = http.svc.SetNotifyServer(methodCtx, request.Token, request.Id, request.Url)
272+
var response responseServerSettingsGetDeletedRooms
273+
response.DeletedIds, err = http.svc.GetDeletedRooms(methodCtx, request.Token, request.Ids)
274274
if err != nil {
275275
if http.errorHandler != nil {
276276
err = http.errorHandler(err)
@@ -418,8 +418,8 @@ func (http *httpServerSettings) doSingleBatch(ctx *fiber.Ctx, request baseJsonRP
418418
return http.getServerSettings(ctx, request)
419419
case "createroom":
420420
return http.createRoom(ctx, request)
421-
case "setnotifyserver":
422-
return http.setNotifyServer(ctx, request)
421+
case "getdeletedrooms":
422+
return http.getDeletedRooms(ctx, request)
423423
default:
424424
ext.Error.Set(span, true)
425425
span.SetTag("msg", "invalid method '"+methodNameOrigin+"'")

0 commit comments

Comments
 (0)