@marleena/trb-proto 1.0.8 → 1.0.20

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 Анатолий
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 Анатолий
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,64 +1,69 @@
-# TrB proto
-
-Контракты сервисов и сгенерированный код:
-
-- Go — `gen/go`
-- JavaScript / TypeScript (protobuf + gRPC-Web) — npm-пакет [`@marleena/trb-proto`](https://www.npmjs.com/package/@marleena/trb-proto)
-
-## Генерация
-
-Нужны `protoc` и плагины: `protoc-gen-go`, `protoc-gen-go-grpc`, `protoc-gen-grpc-gateway`, `protoc-gen-js`, `protoc-gen-grpc-web`.
-
-```bash
-make gene
-```
-
-Собирает Go, JS/TS и descriptor set. Google API-аннотации для JS генерируются отдельно, чтобы не попасть в `gen/go`.
-
-Другие цели: `make desc`, `make buf`.
-
-## npm
-
-```bash
-npm install @marleena/trb-proto
-```
-
-```ts
-import { MessageRequest } from '@marleena/trb-proto/example/Example_pb';
-import { exampleClient } from '@marleena/trb-proto/example/ExampleServiceClientPb';
-
-const client = new exampleClient('https://api.example.com');
-const req = new MessageRequest();
-req.setText('hello');
-```
-
-Сервисы: `example`, `tinvest`, `moex`, `clickhouse` (native gRPC), `manager_indicators`, `api/nats`, `api/clickhouse`, `api/db_api`, `api/test`.
-
-`api/clickhouse` (`trb.clickhouse.manager.public.contract.v1.ClickHouseManager`) — DDL: базы, таблицы, колонки. Запросы — `clickhouse.grpc.ClickHouse`, прикладные выборки — `api/db_api`.
-
-`api/db_api` (`trb.db.api.public.contract.v1.DbApi`) — gRPC API веб-клиента к ClickHouse и Postgres. Новый метод добавляется RPC-ом в `services/api/db_api/db_api.proto`.
-
-## Релиз
-
-Одна команда: коммит (если указан `MSG`), новая версия и тег, push в GitHub, публикация npm.
-
-```bash
-make gene
-make release PART=patch MSG="add ClickHouse manager" OTP=123456
-```
-
-`PART`: `patch` (0.1.3 → 0.1.4), `minor` (0.2.0), `major` (1.0.0).
-
-Если изменения уже закоммичены:
-
-```bash
-make release PART=patch OTP=123456
-```
-
-Через token вместо OTP: `TOKEN=npm_...` (сначала `make logout`).
-
-Только npm, без тега и push:
-
-```bash
-make publish OTP=123456
-```
+# TrB proto
+
+Контракты сервисов и сгенерированный код:
+
+- Go — `gen/go`
+- JavaScript / TypeScript (protobuf + gRPC-Web) — npm-пакет [`@marleena/trb-proto`](https://www.npmjs.com/package/@marleena/trb-proto)
+
+## Генерация
+
+Нужны `protoc` и плагины: `protoc-gen-go`, `protoc-gen-go-grpc`, `protoc-gen-grpc-gateway`, `protoc-gen-js`, `protoc-gen-grpc-web`.
+
+```bash
+make gene
+```
+
+Собирает Go, JS/TS и descriptor set. Google API-аннотации для JS генерируются отдельно, чтобы не попасть в `gen/go`.
+
+Другие цели: `make desc`, `make buf`.
+
+## npm
+
+```bash
+npm install @marleena/trb-proto
+```
+
+```ts
+import { MessageRequest } from '@marleena/trb-proto/example/Example_pb';
+import { exampleClient } from '@marleena/trb-proto/example/ExampleServiceClientPb';
+
+const client = new exampleClient('https://api.example.com');
+const req = new MessageRequest();
+req.setText('hello');
+```
+
+Сервисы: `example`, `tinvest`, `moex`, `clickhouse` (native gRPC), `manager_indicators`, `api/nats`, `api/clickhouse`, `api/db_api`, `api/test`.
+
+`api/clickhouse` (`trb.clickhouse.manager.public.contract.v1.ClickHouseManager`) — DDL: базы, таблицы, колонки. Запросы — `clickhouse.grpc.ClickHouse`, прикладные выборки — `api/db_api`.
+
+`api/db_api` (`trb.db.api.public.contract.v1.DbApi`) — gRPC API веб-клиента к ClickHouse и Postgres. Новый метод добавляется RPC-ом в `services/api/db_api/db_api.proto`.
+
+## CI/CD
+
+Один workflow [Release](.github/workflows/release.yml): при коммите в `main` с сообщением `v1.2.3`
+
+- публикует `@marleena/trb-proto` в npm;
+- просит [pkg.go.dev](https://pkg.go.dev/github.com/Mar1eena/trb_proto) проиндексировать `github.com/Mar1eena/trb_proto@v1.2.3` (для этого пушится git-тег той же версии).
+
+Публикация в npm через [Trusted Publishing](https://docs.npmjs.com/trusted-publishers/) (OIDC, без `NPM_TOKEN`).
+
+На [npmjs.com](https://www.npmjs.com) → пакет `@marleena/trb-proto` → **Settings** → **Trusted Publisher** → GitHub Actions:
+
+- Organization or user: `Mar1eena`
+- Repository: `TrB_proto`
+- Workflow filename: `release.yml`
+- Allowed actions: `npm publish`
+
+После успешного релиза токен в GitHub можно удалить. Сообщение коммита должно совпадать с версией в `package.json`.
+
+## Релиз
+
+```bash
+make rel
+```
+
+Собирает proto, поднимает patch-версию, коммитит все изменения с сообщением `v1.2.3` и пушит в `main`. Actions публикует npm и обновляет pkg.go.dev.
+
+Другой шаг версии: `make rel PART=minor` или `PART=major`.
+
+Для коммита нужны `user.name` и `user.email` в Git.

package/gen/js-ts/api/db_api/db_api_pb.d.ts

@@ -61,9 +61,6 @@ export class InstrumentListItem extends jspb.Message {
   hasShare(): boolean;
   clearShare(): InstrumentListItem;
 
-  getActual(): boolean;
-  setActual(value: boolean): InstrumentListItem;
-
   getVersion(): google_protobuf_timestamp_pb.Timestamp | undefined;
   setVersion(value?: google_protobuf_timestamp_pb.Timestamp): InstrumentListItem;
   hasVersion(): boolean;
@@ -83,7 +80,6 @@ export class InstrumentListItem extends jspb.Message {
 export namespace InstrumentListItem {
   export type AsObject = {
     share?: tinvest_instruments_pb.Share.AsObject,
-    actual: boolean,
     version?: google_protobuf_timestamp_pb.Timestamp.AsObject,
     versionCount: number,
   }
@@ -133,9 +129,6 @@ export class InstrumentVersion extends jspb.Message {
   hasShare(): boolean;
   clearShare(): InstrumentVersion;
 
-  getActual(): boolean;
-  setActual(value: boolean): InstrumentVersion;
-
   getVersion(): google_protobuf_timestamp_pb.Timestamp | undefined;
   setVersion(value?: google_protobuf_timestamp_pb.Timestamp): InstrumentVersion;
   hasVersion(): boolean;
@@ -152,7 +145,6 @@ export class InstrumentVersion extends jspb.Message {
 export namespace InstrumentVersion {
   export type AsObject = {
     share?: tinvest_instruments_pb.Share.AsObject,
-    actual: boolean,
     version?: google_protobuf_timestamp_pb.Timestamp.AsObject,
   }
 }

package/gen/js-ts/api/db_api/db_api_pb.js

@@ -805,9 +805,8 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.toObject = func
 proto.trb.db.api.public.contract.v1.InstrumentListItem.toObject = function(includeInstance, msg) {
   var f, obj = {
 share: (f = msg.getShare()) && tinvest_instruments_pb.Share.toObject(includeInstance, f),
-actual: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
 version: (f = msg.getVersion()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-versionCount: jspb.Message.getFieldWithDefault(msg, 4, 0)
+versionCount: jspb.Message.getFieldWithDefault(msg, 3, 0)
   };
 
   if (includeInstance) {
@@ -850,15 +849,11 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.deserializeBinaryFromRead
       msg.setShare(value);
       break;
     case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setActual(value);
-      break;
-    case 3:
       var value = new google_protobuf_timestamp_pb.Timestamp;
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setVersion(value);
       break;
-    case 4:
+    case 3:
       var value = /** @type {number} */ (reader.readInt32());
       msg.setVersionCount(value);
       break;
@@ -899,17 +894,10 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.serializeBinaryToWriter =
       tinvest_instruments_pb.Share.serializeBinaryToWriter
     );
   }
-  f = message.getActual();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
   f = message.getVersion();
   if (f != null) {
     writer.writeMessage(
-      3,
+      2,
       f,
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
@@ -917,7 +905,7 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.serializeBinaryToWriter =
   f = message.getVersionCount();
   if (f !== 0) {
     writer.writeInt32(
-      4,
+      3,
       f
     );
   }
@@ -962,30 +950,12 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.hasShare = func
 
 
 /**
- * optional bool actual = 2;
- * @return {boolean}
- */
-proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.getActual = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.trb.db.api.public.contract.v1.InstrumentListItem} returns this
- */
-proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.setActual = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 2, value);
-};
-
-
-/**
- * optional google.protobuf.Timestamp version = 3;
+ * optional google.protobuf.Timestamp version = 2;
  * @return {?proto.google.protobuf.Timestamp}
  */
 proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.getVersion = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 3));
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
 };
 
 
@@ -994,7 +964,7 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.getVersion = fu
  * @return {!proto.trb.db.api.public.contract.v1.InstrumentListItem} returns this
 */
 proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.setVersion = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+  return jspb.Message.setWrapperField(this, 2, value);
 };
 
 
@@ -1012,16 +982,16 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.clearVersion =
  * @return {boolean}
  */
 proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.hasVersion = function() {
-  return jspb.Message.getField(this, 3) != null;
+  return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
- * optional int32 version_count = 4;
+ * optional int32 version_count = 3;
  * @return {number}
  */
 proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.getVersionCount = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
@@ -1030,7 +1000,7 @@ proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.getVersionCount
  * @return {!proto.trb.db.api.public.contract.v1.InstrumentListItem} returns this
  */
 proto.trb.db.api.public.contract.v1.InstrumentListItem.prototype.setVersionCount = function(value) {
-  return jspb.Message.setProto3IntField(this, 4, value);
+  return jspb.Message.setProto3IntField(this, 3, value);
 };
 
 
@@ -1357,7 +1327,6 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.toObject = funct
 proto.trb.db.api.public.contract.v1.InstrumentVersion.toObject = function(includeInstance, msg) {
   var f, obj = {
 share: (f = msg.getShare()) && tinvest_instruments_pb.Share.toObject(includeInstance, f),
-actual: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
 version: (f = msg.getVersion()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
   };
 
@@ -1401,10 +1370,6 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.deserializeBinaryFromReade
       msg.setShare(value);
       break;
     case 2:
-      var value = /** @type {boolean} */ (reader.readBool());
-      msg.setActual(value);
-      break;
-    case 3:
       var value = new google_protobuf_timestamp_pb.Timestamp;
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setVersion(value);
@@ -1446,17 +1411,10 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.serializeBinaryToWriter =
       tinvest_instruments_pb.Share.serializeBinaryToWriter
     );
   }
-  f = message.getActual();
-  if (f) {
-    writer.writeBool(
-      2,
-      f
-    );
-  }
   f = message.getVersion();
   if (f != null) {
     writer.writeMessage(
-      3,
+      2,
       f,
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
@@ -1502,30 +1460,12 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.hasShare = funct
 
 
 /**
- * optional bool actual = 2;
- * @return {boolean}
- */
-proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.getActual = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false));
-};
-
-
-/**
- * @param {boolean} value
- * @return {!proto.trb.db.api.public.contract.v1.InstrumentVersion} returns this
- */
-proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.setActual = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 2, value);
-};
-
-
-/**
- * optional google.protobuf.Timestamp version = 3;
+ * optional google.protobuf.Timestamp version = 2;
  * @return {?proto.google.protobuf.Timestamp}
  */
 proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.getVersion = function() {
   return /** @type{?proto.google.protobuf.Timestamp} */ (
-    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 3));
+    jspb.Message.getWrapperField(this, google_protobuf_timestamp_pb.Timestamp, 2));
 };
 
 
@@ -1534,7 +1474,7 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.getVersion = fun
  * @return {!proto.trb.db.api.public.contract.v1.InstrumentVersion} returns this
 */
 proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.setVersion = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
+  return jspb.Message.setWrapperField(this, 2, value);
 };
 
 
@@ -1552,7 +1492,7 @@ proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.clearVersion = f
  * @return {boolean}
  */
 proto.trb.db.api.public.contract.v1.InstrumentVersion.prototype.hasVersion = function() {
-  return jspb.Message.getField(this, 3) != null;
+  return jspb.Message.getField(this, 2) != null;
 };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marleena/trb-proto",
-  "version": "v1.0.8",
+  "version": "1.0.20",
   "description": "Generated protobuf messages and gRPC-Web clients for TrB services",
   "license": "MIT",
   "repository": {