Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use --force-message for proto autogenerated files #140

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions main/networking/Runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,21 @@ function createPacket(payload: unknown, messageType: MsgType): Buffer {

switch (messageType) {
case MsgType.DEVICE_DATA:
encodedPayload = protos.DevData.encode(payload as protos.IDevData).finish();
encodedPayload = protos.DevData.encode(protos.DevData.create(payload as protos.IDevData)).finish();
break;
case MsgType.RUN_MODE:
encodedPayload = protos.RunMode.encode(payload as protos.IRunMode).finish();
encodedPayload = protos.RunMode.encode(protos.RunMode.create(payload as protos.IRunMode)).finish();
break;
case MsgType.START_POS:
encodedPayload = protos.StartPos.encode(payload as protos.IStartPos).finish();
encodedPayload = protos.StartPos.encode(protos.StartPos.create(payload as protos.IStartPos)).finish();
break;
case MsgType.TIME_STAMPS:
encodedPayload = protos.TimeStamps.encode(payload as protos.ITimeStamps).finish();
encodedPayload = protos.TimeStamps.encode(protos.TimeStamps.create(payload as protos.ITimeStamps)).finish();
break;
case MsgType.INPUTS:
encodedPayload = protos.UserInputs.encode({ inputs: payload as protos.Input[] }).finish();
encodedPayload = protos.UserInputs.encode(
protos.UserInputs.create({ inputs: payload as protos.Input[] } as protos.IUserInputs)
).finish();
break;
default:
console.log('ERROR: trying to create TCP Packet with unknown message type');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"lint": "eslint '*/**/*.ts?(x)'",
"lintfix": "eslint '*/**/*.ts?(x)' --fix",
"postinstall": "patch-package",
"build-protos": "pbjs -t static-module -w es6 -o protos-main/protos.js protos-main/protos/*.proto && pbts -o protos-main/protos.d.ts protos-main/protos.js ",
"build-protos": "pbjs -t static-module --force-message -w es6 -o protos-main/protos.js protos-main/protos/*.proto && pbts -o protos-main/protos.d.ts protos-main/protos.js ",
"watch": "webpack --mode development --watch --progress",
"test": "mocha --require babel-core/register --recursive renderer/**/test/*.test.js",
"release": "yarn build && ts-node release.ts",
Expand Down
50 changes: 25 additions & 25 deletions protos-main/protos.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ export class Param implements IParam {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IParam, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: Param, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified Param message, length delimited. Does not implicitly {@link Param.verify|verify} messages.
* @param message Param message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IParam, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: Param, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a Param message from the specified reader or buffer.
Expand Down Expand Up @@ -129,7 +129,7 @@ export interface IDevice {
type?: (number|null);

/** Device params */
params?: (IParam[]|null);
params?: (Param[]|null);
}

/** Represents a Device. */
Expand Down Expand Up @@ -166,15 +166,15 @@ export class Device implements IDevice {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IDevice, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: Device, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified Device message, length delimited. Does not implicitly {@link Device.verify|verify} messages.
* @param message Device message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IDevice, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: Device, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a Device message from the specified reader or buffer.
Expand Down Expand Up @@ -228,7 +228,7 @@ export class Device implements IDevice {
export interface IDevData {

/** DevData devices */
devices?: (IDevice[]|null);
devices?: (Device[]|null);
}

/** Represents a DevData. */
Expand Down Expand Up @@ -256,15 +256,15 @@ export class DevData implements IDevData {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IDevData, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: DevData, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified DevData message, length delimited. Does not implicitly {@link DevData.verify|verify} messages.
* @param message DevData message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IDevData, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: DevData, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a DevData message from the specified reader or buffer.
Expand Down Expand Up @@ -354,15 +354,15 @@ export class GameState implements IGameState {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IGameState, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: GameState, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified GameState message, length delimited. Does not implicitly {@link GameState.verify|verify} messages.
* @param message GameState message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IGameState, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: GameState, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a GameState message from the specified reader or buffer.
Expand Down Expand Up @@ -468,15 +468,15 @@ export class Input implements IInput {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IInput, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: Input, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified Input message, length delimited. Does not implicitly {@link Input.verify|verify} messages.
* @param message Input message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IInput, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: Input, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes an Input message from the specified reader or buffer.
Expand Down Expand Up @@ -530,7 +530,7 @@ export class Input implements IInput {
export interface IUserInputs {

/** UserInputs inputs */
inputs?: (IInput[]|null);
inputs?: (Input[]|null);
}

/** Represents a UserInputs. */
Expand Down Expand Up @@ -558,15 +558,15 @@ export class UserInputs implements IUserInputs {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IUserInputs, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: UserInputs, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified UserInputs message, length delimited. Does not implicitly {@link UserInputs.verify|verify} messages.
* @param message UserInputs message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IUserInputs, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: UserInputs, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a UserInputs message from the specified reader or buffer.
Expand Down Expand Up @@ -656,15 +656,15 @@ export class RunMode implements IRunMode {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IRunMode, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: RunMode, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified RunMode message, length delimited. Does not implicitly {@link RunMode.verify|verify} messages.
* @param message RunMode message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IRunMode, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: RunMode, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a RunMode message from the specified reader or buffer.
Expand Down Expand Up @@ -770,15 +770,15 @@ export class RuntimeStatus implements IRuntimeStatus {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IRuntimeStatus, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: RuntimeStatus, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified RuntimeStatus message, length delimited. Does not implicitly {@link RuntimeStatus.verify|verify} messages.
* @param message RuntimeStatus message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IRuntimeStatus, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: RuntimeStatus, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a RuntimeStatus message from the specified reader or buffer.
Expand Down Expand Up @@ -866,15 +866,15 @@ export class StartPos implements IStartPos {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IStartPos, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: StartPos, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified StartPos message, length delimited. Does not implicitly {@link StartPos.verify|verify} messages.
* @param message StartPos message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IStartPos, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: StartPos, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a StartPos message from the specified reader or buffer.
Expand Down Expand Up @@ -956,15 +956,15 @@ export class Text implements IText {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: IText, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: Text, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified Text message, length delimited. Does not implicitly {@link Text.verify|verify} messages.
* @param message Text message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: IText, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: Text, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a Text message from the specified reader or buffer.
Expand Down Expand Up @@ -1052,15 +1052,15 @@ export class TimeStamps implements ITimeStamps {
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encode(message: ITimeStamps, writer?: $protobuf.Writer): $protobuf.Writer;
public static encode(message: TimeStamps, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Encodes the specified TimeStamps message, length delimited. Does not implicitly {@link TimeStamps.verify|verify} messages.
* @param message TimeStamps message or plain object to encode
* @param [writer] Writer to encode to
* @returns Writer
*/
public static encodeDelimited(message: ITimeStamps, writer?: $protobuf.Writer): $protobuf.Writer;
public static encodeDelimited(message: TimeStamps, writer?: $protobuf.Writer): $protobuf.Writer;

/**
* Decodes a TimeStamps message from the specified reader or buffer.
Expand Down
Loading