feat(proto): add protocol to HostBody

Author: asjdf

gen/openapi/user/v1/user_service.swagger.json

@@ -234,7 +234,7 @@
         "USER_STATUS_WAIT_EMAIL_CHECK"
       ],
       "default": "USER_STATUS_UNSPECIFIED",
-      "title": "- USER_STATUS_DISABLED: 封禁\n - USER_STATUS_NORMAL: 正常\n - USER_STATUS_WAIT_EMAIL_CHECK: 等待验证邮箱"
+      "description": "- USER_STATUS_DISABLED: 封禁\n - USER_STATUS_NORMAL: 正常\n - USER_STATUS_WAIT_EMAIL_CHECK: 等待验证邮箱"
     }
   }
 }

gen/proto/fetch.pb.ts

@@ -117,15 +117,23 @@ export function replacer(key: any, value: any): any {
   return value;
 }
 
+function dateReviver(key, value) {
+  // check if value match ISO 8601 date format
+  if (typeof value === "string" && /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(.\d+)?(Z)?$/.test(value)) {
+    return new Date(value);
+  }
+  return value;
+}
+
 export function fetchReq<I, O>(path: string, init?: InitReq): Promise<O> {
   const {pathPrefix, ...req} = init || {}
 
   const url = pathPrefix ? `${pathPrefix}${path}` : path
 
-  return fetch(url, req).then(r => r.json().then((body: O) => {
-    if (!r.ok) { throw body; }
-    return body;
-  })) as Promise<O>
+  return fetch(url, req).then(async r=> {
+    if (!r.ok){throw await r.json()}
+    return JSON.parse(await r.text(), dateReviver);
+  }) as Promise<O>
 }
 
 // NotifyStreamEntityArrival is a callback that will be called on streaming entity arrival
@@ -301,6 +309,8 @@ function flattenRequestPayload<T extends RequestPayload>(
         objectToMerge = flattenRequestPayload(value as RequestPayload, newPath);
       } else if (isNonZeroValuePrimitive || isNonEmptyPrimitiveArray) {
         objectToMerge = { [newPath]: value };
+      } else if (value instanceof Date){
+        objectToMerge = { [newPath]: value.toISOString() };
       }
 
       return { ...acc, ...objectToMerge };

gen/proto/sync/v1/config_body.pb.go

@@ -6,6 +6,13 @@
 
 import * as SyncV1Audit from "./audit.pb"
 import * as SyncV1Port_forward from "./port_forward.pb"
+
+export enum HostProtocol {
+  HOST_PROTOCOL_UNSPECIFIED = "HOST_PROTOCOL_UNSPECIFIED",
+  HOST_PROTOCOL_SSH = "HOST_PROTOCOL_SSH",
+  HOST_PROTOCOL_TELNET = "HOST_PROTOCOL_TELNET",
+}
+
 export type SshKeyBody = {
   label?: string
   privateKey?: string
@@ -37,6 +44,7 @@ export type HostBody = {
   identityId?: string
   proxyHostIds?: string[]
   forwardAgent?: boolean
+  protocol?: HostProtocol
 }
 
 export type PortForwardBody = {

gen/proto/sync/v1/config_body.pb.ts

@@ -4,12 +4,11 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as GoogleProtobufTimestamp from "../../google/protobuf/timestamp.pb"
 export type Host = {
   id?: string
-  createdAt?: GoogleProtobufTimestamp.Timestamp
-  updatedAt?: GoogleProtobufTimestamp.Timestamp
-  deletedAt?: GoogleProtobufTimestamp.Timestamp
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
   clientId?: string
   label?: string
   tags?: string[]

gen/proto/sync/v1/host.pb.ts

@@ -4,12 +4,11 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as GoogleProtobufTimestamp from "../../google/protobuf/timestamp.pb"
 export type SshKey = {
   id?: string
-  createdAt?: GoogleProtobufTimestamp.Timestamp
-  updatedAt?: GoogleProtobufTimestamp.Timestamp
-  deletedAt?: GoogleProtobufTimestamp.Timestamp
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
   clientId?: string
   label?: string
   privateKey?: string
@@ -19,9 +18,9 @@ export type SshKey = {
 
 export type Identity = {
   id?: string
-  createdAt?: GoogleProtobufTimestamp.Timestamp
-  updatedAt?: GoogleProtobufTimestamp.Timestamp
-  deletedAt?: GoogleProtobufTimestamp.Timestamp
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
   clientId?: string
   label?: string
   username?: string

gen/proto/sync/v1/keychain.pb.ts

@@ -4,12 +4,11 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as GoogleProtobufTimestamp from "../../google/protobuf/timestamp.pb"
 export type KnownHost = {
   id?: string
-  createdAt?: GoogleProtobufTimestamp.Timestamp
-  updatedAt?: GoogleProtobufTimestamp.Timestamp
-  deletedAt?: GoogleProtobufTimestamp.Timestamp
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
   clientId?: string
   address?: string
   publicKey?: string

gen/proto/sync/v1/known_hosts.pb.ts

@@ -4,7 +4,6 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as GoogleProtobufTimestamp from "../../google/protobuf/timestamp.pb"
 
 export enum PortForwardType {
   PORT_FORWARD_TYPE_UNSPECIFIED = "PORT_FORWARD_TYPE_UNSPECIFIED",
@@ -15,9 +14,9 @@ export enum PortForwardType {
 
 export type PortForward = {
   id?: string
-  createdAt?: GoogleProtobufTimestamp.Timestamp
-  updatedAt?: GoogleProtobufTimestamp.Timestamp
-  deletedAt?: GoogleProtobufTimestamp.Timestamp
+  createdAt?: Date
+  updatedAt?: Date
+  deletedAt?: Date
   clientId?: string
   label?: string
   type?: PortForwardType