@lazycatcloud/sdk 0.1.363 → 0.1.364

package/dist/sys/portal-server/portal-server.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HPortalSysCheckPasswordDesc = exports.HPortalSysResetPasswordDesc = exports.HPortalSysDeleteUserDesc = exports.HPortalSysCreateUserDesc = exports.HPortalSysListUsersDesc = exports.HPortalSysQueryHServerInfoDesc = exports.HPortalSysDesc = exports.HPortalSysClientImpl = exports.SetRelayRequest = exports.SetPasswordHashRequest = exports.GetPasswordHashResponse = exports.GetPasswordHashRequest = exports.PeersInfo = exports.ResetHServerReply = exports.ResetHServerRequest = exports.SetupHServerReply = exports.SetupHServerRequest = exports.ChangeTrustEndDeviceReply = exports.ChangeTrustEndDeviceRequest = exports.CheckPasswordRequest = exports.CreateUserRequest = exports.DeleteUserRequest = exports.ResetPasswordRequest = exports.QueryRoleReply = exports.ChangeRoleReqeust = exports.UserID = exports.ListEndDeviceReply = exports.ListEndDeviceRequest = exports.Device = exports.HServerInfo = exports.ListUsersReply = exports.RemoteSocksReply = exports.RemoteSocksRequest = exports.QueryBoxServicePeerCredResponse = exports.QueryBoxServicePeerCredRequest = exports.EmitBoxServiceChangedRequest = exports.RegisterBoxServiceReply = exports.RegisterBoxServiceRequest = exports.changeTrustEndDeviceRequest_ActionToJSON = exports.changeTrustEndDeviceRequest_ActionFromJSON = exports.ChangeTrustEndDeviceRequest_Action = exports.remoteSocksRequest_LocationTypeToJSON = exports.remoteSocksRequest_LocationTypeFromJSON = exports.RemoteSocksRequest_LocationType = exports.roleToJSON = exports.roleFromJSON = exports.Role = exports.dialerRoleToJSON = exports.dialerRoleFromJSON = exports.DialerRole = void 0;
-exports.GrpcWebError = exports.GrpcWebImpl = exports.HPortalSysDumpPeersDesc = exports.HPortalSysSetRelayDesc = exports.HPortalSysQueryBoxServicePeerCredDesc = exports.HPortalSysEmitBoxServiceChangedDesc = exports.HPortalSysRegisterBoxServiceDesc = exports.HPortalSysResetHServerDesc = exports.HPortalSysSetupHServerDesc = exports.HPortalSysRemoteSocksDesc = exports.HPortalSysListEndDevicesDesc = exports.HPortalSysChangeTrustEndDeviceDesc = exports.HPortalSysChangeRoleDesc = exports.HPortalSysQueryRoleDesc = exports.HPortalSysSetPasswordHashDesc = exports.HPortalSysGetPasswordHashDesc = void 0;
+exports.HPortalSysGetPasswordHashDesc = exports.HPortalSysCheckPasswordDesc = exports.HPortalSysResetPasswordDesc = exports.HPortalSysDeleteUserDesc = exports.HPortalSysCreateUserDesc = exports.HPortalSysListUsersDesc = exports.HPortalSysQueryHServerInfoDesc = exports.HPortalSysDesc = exports.HPortalSysClientImpl = exports.SetPasswordHashRequest = exports.GetPasswordHashResponse = exports.GetPasswordHashRequest = exports.PeersInfo = exports.ResetHServerReply = exports.ResetHServerRequest = exports.SetupHServerReply = exports.SetupHServerRequest = exports.ChangeTrustEndDeviceReply = exports.ChangeTrustEndDeviceRequest = exports.CheckPasswordRequest = exports.CreateUserRequest = exports.DeleteUserRequest = exports.ResetPasswordRequest = exports.QueryRoleReply = exports.ChangeRoleReqeust = exports.UserID = exports.ListEndDeviceReply = exports.ListEndDeviceRequest = exports.Device = exports.HServerInfo = exports.ListUsersReply = exports.RemoteSocksReply = exports.RemoteSocksRequest = exports.QueryBoxServicePeerCredResponse = exports.QueryBoxServicePeerCredRequest = exports.EmitBoxServiceChangedRequest = exports.RegisterBoxServiceReply = exports.RegisterBoxServiceRequest = exports.changeTrustEndDeviceRequest_ActionToJSON = exports.changeTrustEndDeviceRequest_ActionFromJSON = exports.ChangeTrustEndDeviceRequest_Action = exports.remoteSocksRequest_LocationTypeToJSON = exports.remoteSocksRequest_LocationTypeFromJSON = exports.RemoteSocksRequest_LocationType = exports.roleToJSON = exports.roleFromJSON = exports.Role = exports.dialerRoleToJSON = exports.dialerRoleFromJSON = exports.DialerRole = void 0;
+exports.GrpcWebError = exports.GrpcWebImpl = exports.HPortalSysDumpPeersDesc = exports.HPortalSysQueryBoxServicePeerCredDesc = exports.HPortalSysEmitBoxServiceChangedDesc = exports.HPortalSysRegisterBoxServiceDesc = exports.HPortalSysResetHServerDesc = exports.HPortalSysSetupHServerDesc = exports.HPortalSysRemoteSocksDesc = exports.HPortalSysListEndDevicesDesc = exports.HPortalSysChangeTrustEndDeviceDesc = exports.HPortalSysChangeRoleDesc = exports.HPortalSysQueryRoleDesc = exports.HPortalSysSetPasswordHashDesc = void 0;
 /* eslint-disable */
 const grpc_web_1 = require("@improbable-eng/grpc-web");
 const browser_headers_1 = require("browser-headers");
@@ -206,49 +206,49 @@ exports.RegisterBoxServiceRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.serviceName = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.serviceNetwork = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.serviceAddress = reader.string();
                     continue;
                 case 4:
-                    if (tag !== 34) {
+                    if (tag != 34) {
                         break;
                     }
                     message.description = reader.string();
                     continue;
                 case 6:
-                    if (tag !== 50) {
+                    if (tag != 50) {
                         break;
                     }
                     message.extraInfo = reader.string();
                     continue;
                 case 7:
-                    if (tag !== 56) {
+                    if (tag != 56) {
                         break;
                     }
                     message.requireDialerRole = reader.int32();
                     continue;
                 case 8:
-                    if (tag !== 64) {
+                    if (tag != 64) {
                         break;
                     }
                     message.requireTrustDev = reader.bool();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -268,27 +268,13 @@ exports.RegisterBoxServiceRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.serviceName !== "") {
-            obj.serviceName = message.serviceName;
-        }
-        if (message.serviceNetwork !== "") {
-            obj.serviceNetwork = message.serviceNetwork;
-        }
-        if (message.serviceAddress !== "") {
-            obj.serviceAddress = message.serviceAddress;
-        }
-        if (message.description !== "") {
-            obj.description = message.description;
-        }
-        if (message.extraInfo !== "") {
-            obj.extraInfo = message.extraInfo;
-        }
-        if (message.requireDialerRole !== 0) {
-            obj.requireDialerRole = dialerRoleToJSON(message.requireDialerRole);
-        }
-        if (message.requireTrustDev === true) {
-            obj.requireTrustDev = message.requireTrustDev;
-        }
+        message.serviceName !== undefined && (obj.serviceName = message.serviceName);
+        message.serviceNetwork !== undefined && (obj.serviceNetwork = message.serviceNetwork);
+        message.serviceAddress !== undefined && (obj.serviceAddress = message.serviceAddress);
+        message.description !== undefined && (obj.description = message.description);
+        message.extraInfo !== undefined && (obj.extraInfo = message.extraInfo);
+        message.requireDialerRole !== undefined && (obj.requireDialerRole = dialerRoleToJSON(message.requireDialerRole));
+        message.requireTrustDev !== undefined && (obj.requireTrustDev = message.requireTrustDev);
         return obj;
     },
     create(base) {
@@ -322,7 +308,7 @@ exports.RegisterBoxServiceReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -362,13 +348,13 @@ exports.EmitBoxServiceChangedRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.serviceName = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -380,9 +366,7 @@ exports.EmitBoxServiceChangedRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.serviceName !== "") {
-            obj.serviceName = message.serviceName;
-        }
+        message.serviceName !== undefined && (obj.serviceName = message.serviceName);
         return obj;
     },
     create(base) {
@@ -419,25 +403,25 @@ exports.QueryBoxServicePeerCredRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.remoteAddr = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.localAddr = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.protocol = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -453,15 +437,9 @@ exports.QueryBoxServicePeerCredRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.remoteAddr !== "") {
-            obj.remoteAddr = message.remoteAddr;
-        }
-        if (message.localAddr !== "") {
-            obj.localAddr = message.localAddr;
-        }
-        if (message.protocol !== "") {
-            obj.protocol = message.protocol;
-        }
+        message.remoteAddr !== undefined && (obj.remoteAddr = message.remoteAddr);
+        message.localAddr !== undefined && (obj.localAddr = message.localAddr);
+        message.protocol !== undefined && (obj.protocol = message.protocol);
         return obj;
     },
     create(base) {
@@ -509,43 +487,43 @@ exports.QueryBoxServicePeerCredResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.deviceVersion = reader.string();
                     continue;
                 case 4:
-                    if (tag !== 34) {
+                    if (tag != 34) {
                         break;
                     }
                     message.virtualIp = reader.string();
                     continue;
                 case 5:
-                    if (tag !== 42) {
+                    if (tag != 42) {
                         break;
                     }
                     message.peerId = reader.string();
                     continue;
                 case 6:
-                    if (tag !== 48) {
+                    if (tag != 48) {
                         break;
                     }
                     message.isLogined = reader.bool();
                     continue;
                 case 7:
-                    if (tag !== 56) {
+                    if (tag != 56) {
                         break;
                     }
                     message.isTrustDev = reader.bool();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -564,24 +542,12 @@ exports.QueryBoxServicePeerCredResponse = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.deviceVersion !== "") {
-            obj.deviceVersion = message.deviceVersion;
-        }
-        if (message.virtualIp !== "") {
-            obj.virtualIp = message.virtualIp;
-        }
-        if (message.peerId !== "") {
-            obj.peerId = message.peerId;
-        }
-        if (message.isLogined === true) {
-            obj.isLogined = message.isLogined;
-        }
-        if (message.isTrustDev === true) {
-            obj.isTrustDev = message.isTrustDev;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.deviceVersion !== undefined && (obj.deviceVersion = message.deviceVersion);
+        message.virtualIp !== undefined && (obj.virtualIp = message.virtualIp);
+        message.peerId !== undefined && (obj.peerId = message.peerId);
+        message.isLogined !== undefined && (obj.isLogined = message.isLogined);
+        message.isTrustDev !== undefined && (obj.isTrustDev = message.isTrustDev);
         return obj;
     },
     create(base) {
@@ -620,19 +586,19 @@ exports.RemoteSocksRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 8) {
+                    if (tag != 8) {
                         break;
                     }
                     message.locationType = reader.int32();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.target = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -647,12 +613,9 @@ exports.RemoteSocksRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.locationType !== 0) {
-            obj.locationType = remoteSocksRequest_LocationTypeToJSON(message.locationType);
-        }
-        if (message.target !== "") {
-            obj.target = message.target;
-        }
+        message.locationType !== undefined &&
+            (obj.locationType = remoteSocksRequest_LocationTypeToJSON(message.locationType));
+        message.target !== undefined && (obj.target = message.target);
         return obj;
     },
     create(base) {
@@ -684,13 +647,13 @@ exports.RemoteSocksReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.serverUrl = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -702,9 +665,7 @@ exports.RemoteSocksReply = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.serverUrl !== "") {
-            obj.serverUrl = message.serverUrl;
-        }
+        message.serverUrl !== undefined && (obj.serverUrl = message.serverUrl);
         return obj;
     },
     create(base) {
@@ -735,13 +696,13 @@ exports.ListUsersReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uids.push(reader.string());
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -752,10 +713,12 @@ exports.ListUsersReply = {
         return { uids: Array.isArray(object === null || object === void 0 ? void 0 : object.uids) ? object.uids.map((e) => String(e)) : [] };
     },
     toJSON(message) {
-        var _a;
         const obj = {};
-        if ((_a = message.uids) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.uids = message.uids;
+        if (message.uids) {
+            obj.uids = message.uids.map((e) => e);
+        }
+        else {
+            obj.uids = [];
         }
         return obj;
     },
@@ -770,7 +733,7 @@ exports.ListUsersReply = {
     },
 };
 function createBaseHServerInfo() {
-    return { originServer: "", virtualIp: "", boxId: "", boxName: "", boxDomain: "", relayServer: "" };
+    return { originServer: "", virtualIp: "", boxId: "", boxName: "", boxDomain: "" };
 }
 exports.HServerInfo = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -789,9 +752,6 @@ exports.HServerInfo = {
         if (message.boxDomain !== "") {
             writer.uint32(42).string(message.boxDomain);
         }
-        if (message.relayServer !== "") {
-            writer.uint32(50).string(message.relayServer);
-        }
         return writer;
     },
     decode(input, length) {
@@ -802,43 +762,37 @@ exports.HServerInfo = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.originServer = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.virtualIp = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.boxId = reader.string();
                     continue;
                 case 4:
-                    if (tag !== 34) {
+                    if (tag != 34) {
                         break;
                     }
                     message.boxName = reader.string();
                     continue;
                 case 5:
-                    if (tag !== 42) {
+                    if (tag != 42) {
                         break;
                     }
                     message.boxDomain = reader.string();
                     continue;
-                case 6:
-                    if (tag !== 50) {
-                        break;
-                    }
-                    message.relayServer = reader.string();
-                    continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -852,43 +806,28 @@ exports.HServerInfo = {
             boxId: isSet(object.boxId) ? String(object.boxId) : "",
             boxName: isSet(object.boxName) ? String(object.boxName) : "",
             boxDomain: isSet(object.boxDomain) ? String(object.boxDomain) : "",
-            relayServer: isSet(object.relayServer) ? String(object.relayServer) : "",
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.originServer !== "") {
-            obj.originServer = message.originServer;
-        }
-        if (message.virtualIp !== "") {
-            obj.virtualIp = message.virtualIp;
-        }
-        if (message.boxId !== "") {
-            obj.boxId = message.boxId;
-        }
-        if (message.boxName !== "") {
-            obj.boxName = message.boxName;
-        }
-        if (message.boxDomain !== "") {
-            obj.boxDomain = message.boxDomain;
-        }
-        if (message.relayServer !== "") {
-            obj.relayServer = message.relayServer;
-        }
+        message.originServer !== undefined && (obj.originServer = message.originServer);
+        message.virtualIp !== undefined && (obj.virtualIp = message.virtualIp);
+        message.boxId !== undefined && (obj.boxId = message.boxId);
+        message.boxName !== undefined && (obj.boxName = message.boxName);
+        message.boxDomain !== undefined && (obj.boxDomain = message.boxDomain);
         return obj;
     },
     create(base) {
         return exports.HServerInfo.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const message = createBaseHServerInfo();
         message.originServer = (_a = object.originServer) !== null && _a !== void 0 ? _a : "";
         message.virtualIp = (_b = object.virtualIp) !== null && _b !== void 0 ? _b : "";
         message.boxId = (_c = object.boxId) !== null && _c !== void 0 ? _c : "";
         message.boxName = (_d = object.boxName) !== null && _d !== void 0 ? _d : "";
         message.boxDomain = (_e = object.boxDomain) !== null && _e !== void 0 ? _e : "";
-        message.relayServer = (_f = object.relayServer) !== null && _f !== void 0 ? _f : "";
         return message;
     },
 };
@@ -916,25 +855,25 @@ exports.Device = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.peerId = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 16) {
+                    if (tag != 16) {
                         break;
                     }
                     message.isOnline = reader.bool();
                     continue;
                 case 6:
-                    if (tag !== 50) {
+                    if (tag != 50) {
                         break;
                     }
                     message.bindingTime = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -950,15 +889,9 @@ exports.Device = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.peerId !== "") {
-            obj.peerId = message.peerId;
-        }
-        if (message.isOnline === true) {
-            obj.isOnline = message.isOnline;
-        }
-        if (message.bindingTime !== undefined) {
-            obj.bindingTime = message.bindingTime.toISOString();
-        }
+        message.peerId !== undefined && (obj.peerId = message.peerId);
+        message.isOnline !== undefined && (obj.isOnline = message.isOnline);
+        message.bindingTime !== undefined && (obj.bindingTime = message.bindingTime.toISOString());
         return obj;
     },
     create(base) {
@@ -991,13 +924,13 @@ exports.ListEndDeviceRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1009,9 +942,7 @@ exports.ListEndDeviceRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
         return obj;
     },
     create(base) {
@@ -1042,13 +973,13 @@ exports.ListEndDeviceReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.devices.push(exports.Device.decode(reader, reader.uint32()));
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1059,10 +990,12 @@ exports.ListEndDeviceReply = {
         return { devices: Array.isArray(object === null || object === void 0 ? void 0 : object.devices) ? object.devices.map((e) => exports.Device.fromJSON(e)) : [] };
     },
     toJSON(message) {
-        var _a;
         const obj = {};
-        if ((_a = message.devices) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.devices = message.devices.map((e) => exports.Device.toJSON(e));
+        if (message.devices) {
+            obj.devices = message.devices.map((e) => e ? exports.Device.toJSON(e) : undefined);
+        }
+        else {
+            obj.devices = [];
         }
         return obj;
     },
@@ -1094,13 +1027,13 @@ exports.UserID = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1112,9 +1045,7 @@ exports.UserID = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
         return obj;
     },
     create(base) {
@@ -1148,19 +1079,19 @@ exports.ChangeRoleReqeust = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 16) {
+                    if (tag != 16) {
                         break;
                     }
                     message.role = reader.int32();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1175,12 +1106,8 @@ exports.ChangeRoleReqeust = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.role !== 0) {
-            obj.role = roleToJSON(message.role);
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.role !== undefined && (obj.role = roleToJSON(message.role));
         return obj;
     },
     create(base) {
@@ -1215,19 +1142,19 @@ exports.QueryRoleReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 16) {
+                    if (tag != 16) {
                         break;
                     }
                     message.role = reader.int32();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1242,12 +1169,8 @@ exports.QueryRoleReply = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.role !== 0) {
-            obj.role = roleToJSON(message.role);
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.role !== undefined && (obj.role = roleToJSON(message.role));
         return obj;
     },
     create(base) {
@@ -1282,19 +1205,19 @@ exports.ResetPasswordRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.newPassword = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1309,12 +1232,8 @@ exports.ResetPasswordRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.newPassword !== "") {
-            obj.newPassword = message.newPassword;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.newPassword !== undefined && (obj.newPassword = message.newPassword);
         return obj;
     },
     create(base) {
@@ -1346,13 +1265,13 @@ exports.DeleteUserRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1364,9 +1283,7 @@ exports.DeleteUserRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
         return obj;
     },
     create(base) {
@@ -1403,25 +1320,25 @@ exports.CreateUserRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.password = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 24) {
+                    if (tag != 24) {
                         break;
                     }
                     message.role = reader.int32();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1437,15 +1354,9 @@ exports.CreateUserRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.password !== "") {
-            obj.password = message.password;
-        }
-        if (message.role !== 0) {
-            obj.role = roleToJSON(message.role);
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.password !== undefined && (obj.password = message.password);
+        message.role !== undefined && (obj.role = roleToJSON(message.role));
         return obj;
     },
     create(base) {
@@ -1481,19 +1392,19 @@ exports.CheckPasswordRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.password = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1508,12 +1419,8 @@ exports.CheckPasswordRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.password !== "") {
-            obj.password = message.password;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.password !== undefined && (obj.password = message.password);
         return obj;
     },
     create(base) {
@@ -1551,25 +1458,25 @@ exports.ChangeTrustEndDeviceRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.cid = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 24) {
+                    if (tag != 24) {
                         break;
                     }
                     message.action = reader.int32();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1585,15 +1492,9 @@ exports.ChangeTrustEndDeviceRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.cid !== "") {
-            obj.cid = message.cid;
-        }
-        if (message.action !== 0) {
-            obj.action = changeTrustEndDeviceRequest_ActionToJSON(message.action);
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.cid !== undefined && (obj.cid = message.cid);
+        message.action !== undefined && (obj.action = changeTrustEndDeviceRequest_ActionToJSON(message.action));
         return obj;
     },
     create(base) {
@@ -1623,7 +1524,7 @@ exports.ChangeTrustEndDeviceReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1672,31 +1573,31 @@ exports.SetupHServerRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.originServer = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.boxName = reader.string();
                     continue;
                 case 3:
-                    if (tag !== 26) {
+                    if (tag != 26) {
                         break;
                     }
                     message.username = reader.string();
                     continue;
                 case 4:
-                    if (tag !== 34) {
+                    if (tag != 34) {
                         break;
                     }
                     message.password = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1713,18 +1614,10 @@ exports.SetupHServerRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.originServer !== "") {
-            obj.originServer = message.originServer;
-        }
-        if (message.boxName !== "") {
-            obj.boxName = message.boxName;
-        }
-        if (message.username !== "") {
-            obj.username = message.username;
-        }
-        if (message.password !== "") {
-            obj.password = message.password;
-        }
+        message.originServer !== undefined && (obj.originServer = message.originServer);
+        message.boxName !== undefined && (obj.boxName = message.boxName);
+        message.username !== undefined && (obj.username = message.username);
+        message.password !== undefined && (obj.password = message.password);
         return obj;
     },
     create(base) {
@@ -1761,19 +1654,19 @@ exports.SetupHServerReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 8) {
+                    if (tag != 8) {
                         break;
                     }
                     message.ok = reader.bool();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.reason = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1788,12 +1681,8 @@ exports.SetupHServerReply = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.ok === true) {
-            obj.ok = message.ok;
-        }
-        if (message.reason !== "") {
-            obj.reason = message.reason;
-        }
+        message.ok !== undefined && (obj.ok = message.ok);
+        message.reason !== undefined && (obj.reason = message.reason);
         return obj;
     },
     create(base) {
@@ -1825,13 +1714,13 @@ exports.ResetHServerRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.originServer = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1843,9 +1732,7 @@ exports.ResetHServerRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.originServer !== "") {
-            obj.originServer = message.originServer;
-        }
+        message.originServer !== undefined && (obj.originServer = message.originServer);
         return obj;
     },
     create(base) {
@@ -1873,7 +1760,7 @@ exports.ResetHServerReply = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1913,13 +1800,13 @@ exports.PeersInfo = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.peerInfo = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1931,9 +1818,7 @@ exports.PeersInfo = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.peerInfo !== "") {
-            obj.peerInfo = message.peerInfo;
-        }
+        message.peerInfo !== undefined && (obj.peerInfo = message.peerInfo);
         return obj;
     },
     create(base) {
@@ -1964,13 +1849,13 @@ exports.GetPasswordHashRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -1982,9 +1867,7 @@ exports.GetPasswordHashRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
         return obj;
     },
     create(base) {
@@ -2015,13 +1898,13 @@ exports.GetPasswordHashResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.passwordHash = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -2033,9 +1916,7 @@ exports.GetPasswordHashResponse = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.passwordHash !== "") {
-            obj.passwordHash = message.passwordHash;
-        }
+        message.passwordHash !== undefined && (obj.passwordHash = message.passwordHash);
         return obj;
     },
     create(base) {
@@ -2069,19 +1950,19 @@ exports.SetPasswordHashRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag !== 10) {
+                    if (tag != 10) {
                         break;
                     }
                     message.uid = reader.string();
                     continue;
                 case 2:
-                    if (tag !== 18) {
+                    if (tag != 18) {
                         break;
                     }
                     message.passwordHash = reader.string();
                     continue;
             }
-            if ((tag & 7) === 4 || tag === 0) {
+            if ((tag & 7) == 4 || tag == 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -2096,12 +1977,8 @@ exports.SetPasswordHashRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.uid !== "") {
-            obj.uid = message.uid;
-        }
-        if (message.passwordHash !== "") {
-            obj.passwordHash = message.passwordHash;
-        }
+        message.uid !== undefined && (obj.uid = message.uid);
+        message.passwordHash !== undefined && (obj.passwordHash = message.passwordHash);
         return obj;
     },
     create(base) {
@@ -2115,57 +1992,6 @@ exports.SetPasswordHashRequest = {
         return message;
     },
 };
-function createBaseSetRelayRequest() {
-    return { relayAddress: "" };
-}
-exports.SetRelayRequest = {
-    encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.relayAddress !== "") {
-            writer.uint32(10).string(message.relayAddress);
-        }
-        return writer;
-    },
-    decode(input, length) {
-        const reader = input instanceof minimal_1.default.Reader ? input : minimal_1.default.Reader.create(input);
-        let end = length === undefined ? reader.len : reader.pos + length;
-        const message = createBaseSetRelayRequest();
-        while (reader.pos < end) {
-            const tag = reader.uint32();
-            switch (tag >>> 3) {
-                case 1:
-                    if (tag !== 10) {
-                        break;
-                    }
-                    message.relayAddress = reader.string();
-                    continue;
-            }
-            if ((tag & 7) === 4 || tag === 0) {
-                break;
-            }
-            reader.skipType(tag & 7);
-        }
-        return message;
-    },
-    fromJSON(object) {
-        return { relayAddress: isSet(object.relayAddress) ? String(object.relayAddress) : "" };
-    },
-    toJSON(message) {
-        const obj = {};
-        if (message.relayAddress !== "") {
-            obj.relayAddress = message.relayAddress;
-        }
-        return obj;
-    },
-    create(base) {
-        return exports.SetRelayRequest.fromPartial(base !== null && base !== void 0 ? base : {});
-    },
-    fromPartial(object) {
-        var _a;
-        const message = createBaseSetRelayRequest();
-        message.relayAddress = (_a = object.relayAddress) !== null && _a !== void 0 ? _a : "";
-        return message;
-    },
-};
 class HPortalSysClientImpl {
     constructor(rpc) {
         this.rpc = rpc;
@@ -2187,7 +2013,6 @@ class HPortalSysClientImpl {
         this.RegisterBoxService = this.RegisterBoxService.bind(this);
         this.EmitBoxServiceChanged = this.EmitBoxServiceChanged.bind(this);
         this.QueryBoxServicePeerCred = this.QueryBoxServicePeerCred.bind(this);
-        this.SetRelay = this.SetRelay.bind(this);
         this.DumpPeers = this.DumpPeers.bind(this);
     }
     QueryHServerInfo(request, metadata, abortSignal) {
@@ -2244,9 +2069,6 @@ class HPortalSysClientImpl {
     QueryBoxServicePeerCred(request, metadata, abortSignal) {
         return this.rpc.unary(exports.HPortalSysQueryBoxServicePeerCredDesc, exports.QueryBoxServicePeerCredRequest.fromPartial(request), metadata, abortSignal);
     }
-    SetRelay(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.HPortalSysSetRelayDesc, exports.SetRelayRequest.fromPartial(request), metadata, abortSignal);
-    }
     DumpPeers(request, metadata, abortSignal) {
         return this.rpc.unary(exports.HPortalSysDumpPeersDesc, empty_1.Empty.fromPartial(request), metadata, abortSignal);
     }
@@ -2595,25 +2417,6 @@ exports.HPortalSysQueryBoxServicePeerCredDesc = {
         },
     },
 };
-exports.HPortalSysSetRelayDesc = {
-    methodName: "SetRelay",
-    service: exports.HPortalSysDesc,
-    requestStream: false,
-    responseStream: false,
-    requestType: {
-        serializeBinary() {
-            return exports.SetRelayRequest.encode(this).finish();
-        },
-    },
-    responseType: {
-        deserializeBinary(data) {
-            const value = empty_1.Empty.decode(data);
-            return Object.assign(Object.assign({}, value), { toObject() {
-                    return value;
-                } });
-        },
-    },
-};
 exports.HPortalSysDumpPeersDesc = {
     methodName: "DumpPeers",
     service: exports.HPortalSysDesc,
@@ -2643,10 +2446,15 @@ class GrpcWebImpl {
         const request = Object.assign(Object.assign({}, _request), methodDesc.requestType);
         const maybeCombinedMetadata = metadata && this.options.metadata
             ? new browser_headers_1.BrowserHeaders(Object.assign(Object.assign({}, (_a = this.options) === null || _a === void 0 ? void 0 : _a.metadata.headersMap), metadata === null || metadata === void 0 ? void 0 : metadata.headersMap))
-            : metadata !== null && metadata !== void 0 ? metadata : this.options.metadata;
+            : metadata || this.options.metadata;
         return new Promise((resolve, reject) => {
-            var _a;
-            const client = grpc_web_1.grpc.unary(methodDesc, Object.assign(Object.assign({ request, host: this.host, metadata: maybeCombinedMetadata !== null && maybeCombinedMetadata !== void 0 ? maybeCombinedMetadata : {} }, (this.options.transport !== undefined ? { transport: this.options.transport } : {})), { debug: (_a = this.options.debug) !== null && _a !== void 0 ? _a : false, onEnd: function (response) {
+            const client = grpc_web_1.grpc.unary(methodDesc, {
+                request,
+                host: this.host,
+                metadata: maybeCombinedMetadata,
+                transport: this.options.transport,
+                debug: this.options.debug,
+                onEnd: function (response) {
                     if (response.status === grpc_web_1.grpc.Code.OK) {
                         resolve(response.message.toObject());
                     }
@@ -2654,28 +2462,35 @@ class GrpcWebImpl {
                         const err = new GrpcWebError(response.statusMessage, response.status, response.trailers);
                         reject(err);
                     }
-                } }));
+                },
+            });
+            const abortHandler = () => {
+                client.close();
+                reject(new Error("Aborted"));
+            };
             if (abortSignal) {
-                abortSignal.addEventListener("abort", () => {
-                    client.close();
-                    reject(abortSignal.reason);
-                });
+                abortSignal.addEventListener("abort", abortHandler);
             }
         });
     }
     invoke(methodDesc, _request, metadata, abortSignal) {
-        var _a, _b, _c;
-        const upStreamCodes = (_a = this.options.upStreamRetryCodes) !== null && _a !== void 0 ? _a : [];
+        var _a;
+        const upStreamCodes = this.options.upStreamRetryCodes || [];
         const DEFAULT_TIMEOUT_TIME = 3000;
         const request = Object.assign(Object.assign({}, _request), methodDesc.requestType);
-        const transport = (_b = this.options.streamingTransport) !== null && _b !== void 0 ? _b : this.options.transport;
         const maybeCombinedMetadata = metadata && this.options.metadata
-            ? new browser_headers_1.BrowserHeaders(Object.assign(Object.assign({}, (_c = this.options) === null || _c === void 0 ? void 0 : _c.metadata.headersMap), metadata === null || metadata === void 0 ? void 0 : metadata.headersMap))
-            : metadata !== null && metadata !== void 0 ? metadata : this.options.metadata;
+            ? new browser_headers_1.BrowserHeaders(Object.assign(Object.assign({}, (_a = this.options) === null || _a === void 0 ? void 0 : _a.metadata.headersMap), metadata === null || metadata === void 0 ? void 0 : metadata.headersMap))
+            : metadata || this.options.metadata;
         return new rxjs_1.Observable((observer) => {
-            const upStream = () => {
-                var _a;
-                const client = grpc_web_1.grpc.invoke(methodDesc, Object.assign(Object.assign({ host: this.host, request }, (transport !== undefined ? { transport } : {})), { metadata: maybeCombinedMetadata !== null && maybeCombinedMetadata !== void 0 ? maybeCombinedMetadata : {}, debug: (_a = this.options.debug) !== null && _a !== void 0 ? _a : false, onMessage: (next) => observer.next(next), onEnd: (code, message, trailers) => {
+            const upStream = (() => {
+                const client = grpc_web_1.grpc.invoke(methodDesc, {
+                    host: this.host,
+                    request,
+                    transport: this.options.streamingTransport || this.options.transport,
+                    metadata: maybeCombinedMetadata,
+                    debug: this.options.debug,
+                    onMessage: (next) => observer.next(next),
+                    onEnd: (code, message, trailers) => {
                         if (code === 0) {
                             observer.complete();
                         }
@@ -2688,25 +2503,27 @@ class GrpcWebImpl {
                             err.metadata = trailers;
                             observer.error(err);
                         }
-                    } }));
+                    },
+                });
                 observer.add(() => {
-                    if (!abortSignal || !abortSignal.aborted) {
+                    if (!observer.closed) {
                         return client.close();
                     }
                 });
+                const abortHandler = () => {
+                    observer.error("Aborted");
+                    client.close();
+                };
                 if (abortSignal) {
-                    abortSignal.addEventListener("abort", () => {
-                        observer.error(abortSignal.reason);
-                        client.close();
-                    });
+                    abortSignal.addEventListener("abort", abortHandler);
                 }
-            };
+            });
             upStream();
         }).pipe((0, operators_1.share)());
     }
 }
 exports.GrpcWebImpl = GrpcWebImpl;
-const tsProtoGlobalThis = (() => {
+var tsProtoGlobalThis = (() => {
     if (typeof globalThis !== "undefined") {
         return globalThis;
     }
@@ -2727,8 +2544,8 @@ function toTimestamp(date) {
     return { seconds, nanos };
 }
 function fromTimestamp(t) {
-    let millis = (t.seconds || 0) * 1000;
-    millis += (t.nanos || 0) / 1000000;
+    let millis = t.seconds * 1000;
+    millis += t.nanos / 1000000;
     return new Date(millis);
 }
 function fromJsonTimestamp(o) {