From dbf550b7001f7799ef504d994ae658c3623d1f33 Mon Sep 17 00:00:00 2001 From: iamBadgers Date: Wed, 11 Jun 2025 00:03:39 -0700 Subject: [PATCH] small cleanup --- .gitignore | 2 +- frontend/src/proto/character.client.ts | 49 ------- frontend/src/proto/character.ts | 186 ------------------------- vault/src/character_service.ts | 17 ++- 4 files changed, 14 insertions(+), 240 deletions(-) delete mode 100644 frontend/src/proto/character.client.ts delete mode 100644 frontend/src/proto/character.ts diff --git a/.gitignore b/.gitignore index 6ce46e1..52c58c3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ dist rush-character-archive/dist # generated files -rush-character-archive/src/proto +frontend/src/proto vault/src/proto # sqlite file diff --git a/frontend/src/proto/character.client.ts b/frontend/src/proto/character.client.ts deleted file mode 100644 index 33e22e9..0000000 --- a/frontend/src/proto/character.client.ts +++ /dev/null @@ -1,49 +0,0 @@ -// @generated by protobuf-ts 2.11.0 -// @generated from protobuf file "character.proto" (syntax proto3) -// tslint:disable -import type { RpcTransport } from "@protobuf-ts/runtime-rpc"; -import type { ServiceInfo } from "@protobuf-ts/runtime-rpc"; -import { CharacterManager } from "./character"; -import type { GetCharacterRequest } from "./character"; -import { stackIntercept } from "@protobuf-ts/runtime-rpc"; -import type { Character } from "./character"; -import type { CreateCharacterRequest } from "./character"; -import type { UnaryCall } from "@protobuf-ts/runtime-rpc"; -import type { RpcOptions } from "@protobuf-ts/runtime-rpc"; -/** - * @generated from protobuf service CharacterManager - */ -export interface ICharacterManagerClient { - /** - * @generated from protobuf rpc: createCharacter - */ - createCharacter(input: CreateCharacterRequest, options?: RpcOptions): UnaryCall; - /** - * @generated from protobuf rpc: getCharacter - */ - getCharacter(input: GetCharacterRequest, options?: RpcOptions): UnaryCall; -} -/** - * @generated from protobuf service CharacterManager - */ -export class CharacterManagerClient implements ICharacterManagerClient, ServiceInfo { - typeName = CharacterManager.typeName; - methods = CharacterManager.methods; - options = CharacterManager.options; - constructor(private readonly _transport: RpcTransport) { - } - /** - * @generated from protobuf rpc: createCharacter - */ - createCharacter(input: CreateCharacterRequest, options?: RpcOptions): UnaryCall { - const method = this.methods[0], opt = this._transport.mergeOptions(options); - return stackIntercept("unary", this._transport, method, opt, input); - } - /** - * @generated from protobuf rpc: getCharacter - */ - getCharacter(input: GetCharacterRequest, options?: RpcOptions): UnaryCall { - const method = this.methods[1], opt = this._transport.mergeOptions(options); - return stackIntercept("unary", this._transport, method, opt, input); - } -} diff --git a/frontend/src/proto/character.ts b/frontend/src/proto/character.ts deleted file mode 100644 index 0af1ed7..0000000 --- a/frontend/src/proto/character.ts +++ /dev/null @@ -1,186 +0,0 @@ -// @generated by protobuf-ts 2.11.0 -// @generated from protobuf file "character.proto" (syntax proto3) -// tslint:disable -import { ServiceType } from "@protobuf-ts/runtime-rpc"; -import type { BinaryWriteOptions } from "@protobuf-ts/runtime"; -import type { IBinaryWriter } from "@protobuf-ts/runtime"; -import { WireType } from "@protobuf-ts/runtime"; -import type { BinaryReadOptions } from "@protobuf-ts/runtime"; -import type { IBinaryReader } from "@protobuf-ts/runtime"; -import { UnknownFieldHandler } from "@protobuf-ts/runtime"; -import type { PartialMessage } from "@protobuf-ts/runtime"; -import { reflectionMergePartial } from "@protobuf-ts/runtime"; -import { MessageType } from "@protobuf-ts/runtime"; -/** - * @generated from protobuf message Character - */ -export interface Character { - /** - * @generated from protobuf field: string PlayerName = 1 - */ - playerName: string; - /** - * @generated from protobuf field: string CharacterName = 2 - */ - characterName: string; - /** - * @generated from protobuf field: repeated string CharacterAlias = 3 - */ - characterAlias: string[]; -} -/** - * @generated from protobuf message CreateCharacterRequest - */ -export interface CreateCharacterRequest { -} -/** - * @generated from protobuf message GetCharacterRequest - */ -export interface GetCharacterRequest { -} -// @generated message type with reflection information, may provide speed optimized methods -class Character$Type extends MessageType { - constructor() { - super("Character", [ - { no: 1, name: "PlayerName", kind: "scalar", jsonName: "PlayerName", T: 9 /*ScalarType.STRING*/ }, - { no: 2, name: "CharacterName", kind: "scalar", jsonName: "CharacterName", T: 9 /*ScalarType.STRING*/ }, - { no: 3, name: "CharacterAlias", kind: "scalar", jsonName: "CharacterAlias", repeat: 2 /*RepeatType.UNPACKED*/, T: 9 /*ScalarType.STRING*/ } - ]); - } - create(value?: PartialMessage): Character { - const message = globalThis.Object.create((this.messagePrototype!)); - message.playerName = ""; - message.characterName = ""; - message.characterAlias = []; - if (value !== undefined) - reflectionMergePartial(this, message, value); - return message; - } - internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Character): Character { - let message = target ?? this.create(), end = reader.pos + length; - while (reader.pos < end) { - let [fieldNo, wireType] = reader.tag(); - switch (fieldNo) { - case /* string PlayerName */ 1: - message.playerName = reader.string(); - break; - case /* string CharacterName */ 2: - message.characterName = reader.string(); - break; - case /* repeated string CharacterAlias */ 3: - message.characterAlias.push(reader.string()); - break; - default: - let u = options.readUnknownField; - if (u === "throw") - throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`); - let d = reader.skip(wireType); - if (u !== false) - (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d); - } - } - return message; - } - internalBinaryWrite(message: Character, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - /* string PlayerName = 1; */ - if (message.playerName !== "") - writer.tag(1, WireType.LengthDelimited).string(message.playerName); - /* string CharacterName = 2; */ - if (message.characterName !== "") - writer.tag(2, WireType.LengthDelimited).string(message.characterName); - /* repeated string CharacterAlias = 3; */ - for (let i = 0; i < message.characterAlias.length; i++) - writer.tag(3, WireType.LengthDelimited).string(message.characterAlias[i]); - let u = options.writeUnknownFields; - if (u !== false) - (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); - return writer; - } -} -/** - * @generated MessageType for protobuf message Character - */ -export const Character = new Character$Type(); -// @generated message type with reflection information, may provide speed optimized methods -class CreateCharacterRequest$Type extends MessageType { - constructor() { - super("CreateCharacterRequest", []); - } - create(value?: PartialMessage): CreateCharacterRequest { - const message = globalThis.Object.create((this.messagePrototype!)); - if (value !== undefined) - reflectionMergePartial(this, message, value); - return message; - } - internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: CreateCharacterRequest): CreateCharacterRequest { - let message = target ?? this.create(), end = reader.pos + length; - while (reader.pos < end) { - let [fieldNo, wireType] = reader.tag(); - switch (fieldNo) { - default: - let u = options.readUnknownField; - if (u === "throw") - throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`); - let d = reader.skip(wireType); - if (u !== false) - (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d); - } - } - return message; - } - internalBinaryWrite(message: CreateCharacterRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - let u = options.writeUnknownFields; - if (u !== false) - (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); - return writer; - } -} -/** - * @generated MessageType for protobuf message CreateCharacterRequest - */ -export const CreateCharacterRequest = new CreateCharacterRequest$Type(); -// @generated message type with reflection information, may provide speed optimized methods -class GetCharacterRequest$Type extends MessageType { - constructor() { - super("GetCharacterRequest", []); - } - create(value?: PartialMessage): GetCharacterRequest { - const message = globalThis.Object.create((this.messagePrototype!)); - if (value !== undefined) - reflectionMergePartial(this, message, value); - return message; - } - internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GetCharacterRequest): GetCharacterRequest { - let message = target ?? this.create(), end = reader.pos + length; - while (reader.pos < end) { - let [fieldNo, wireType] = reader.tag(); - switch (fieldNo) { - default: - let u = options.readUnknownField; - if (u === "throw") - throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`); - let d = reader.skip(wireType); - if (u !== false) - (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d); - } - } - return message; - } - internalBinaryWrite(message: GetCharacterRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter { - let u = options.writeUnknownFields; - if (u !== false) - (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer); - return writer; - } -} -/** - * @generated MessageType for protobuf message GetCharacterRequest - */ -export const GetCharacterRequest = new GetCharacterRequest$Type(); -/** - * @generated ServiceType for protobuf service CharacterManager - */ -export const CharacterManager = new ServiceType("CharacterManager", [ - { name: "createCharacter", options: {}, I: CreateCharacterRequest, O: Character }, - { name: "getCharacter", options: {}, I: GetCharacterRequest, O: Character } -]); diff --git a/vault/src/character_service.ts b/vault/src/character_service.ts index 58fc5ed..c24a15e 100644 --- a/vault/src/character_service.ts +++ b/vault/src/character_service.ts @@ -1,14 +1,15 @@ import { Server, ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js' import { - UnimplementedCharacterManagerService, Character, GetCharacterRequest, CreateCharacterRequest, } from './proto/character' +import { characterManagerDefinition } from "./proto/character.grpc-server" + export function initCharacterService(server: Server) { - server.addService(UnimplementedCharacterManagerService.definition, { + server.addService(characterManagerDefinition, { createCharacter: createCharacter_Call, getCharacter: getCharacter_Call, }) @@ -19,7 +20,11 @@ function createCharacter_Call(call: ServerUnaryCall, callback: sendUnaryData) { @@ -27,5 +32,9 @@ function getCharacter_Call(call: ServerUnaryCall } function getCharacter(request: GetCharacterRequest): Character { - return new Character() + return { + playerName: "test player", + characterName: "test character", + characterAlias: ["test alias"] + } }