@lazycatcloud/sdk 0.1.435 → 0.1.437

package/dist/sys/hc-core/hc-core.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GrpcWebError = exports.GrpcWebImpl = exports.CoreSystemInstanceResumeDesc = exports.CoreSystemInstancePauseDesc = exports.CoreSystemInstanceRemoveDesc = exports.CoreSystemInstanceAddDesc = exports.CoreSystemInstanceStatusDesc = exports.CoreSystemAppStatusDesc = exports.CoreSystemStatusDesc = exports.CoreSystemQueryDesc = exports.CoreSystemEnableDesc = exports.CoreSystemDisableDesc = exports.CoreSystemRemoveDesc = exports.CoreSystemApplyLpkDesc = exports.CoreSystemApply3Desc = exports.CoreSystemApply2Desc = exports.CoreSystemApplyDesc = exports.CoreSystemListDesc = exports.CoreSystemDesc = exports.CoreSystemClientImpl = exports.RawData = exports.AppsStatus_AppsStatusEntry = exports.AppsStatus = exports.InstancesStatus_InstancesStatusEntry = exports.InstancesStatus = exports.StatusInfo = exports.AppMetadataArray = exports.AppMetadata = exports.QueryRequest = exports.AppIdList = exports.DeleteRequest = exports.InstanceInfo = exports.AppId = exports.ListOptRequest = exports.statusInfo_StatusTypeToJSON = exports.statusInfo_StatusTypeFromJSON = exports.StatusInfo_StatusType = exports.listOptTypeToJSON = exports.listOptTypeFromJSON = exports.ListOptType = void 0;
+exports.GrpcWebError = exports.GrpcWebImpl = exports.CoreSystemInstanceResumeDesc = exports.CoreSystemInstancePauseDesc = exports.CoreSystemInstanceRemoveDesc = exports.CoreSystemInstanceAddDesc = exports.CoreSystemInstanceStatusDesc = exports.CoreSystemAppStatusDesc = exports.CoreSystemStatusDesc = exports.CoreSystemQueryDesc = exports.CoreSystemEnableDesc = exports.CoreSystemDisableDesc = exports.CoreSystemRemoveDesc = exports.CoreSystemApply3Desc = exports.CoreSystemApply2Desc = exports.CoreSystemApplyDesc = exports.CoreSystemListDesc = exports.CoreSystemDesc = exports.CoreSystemClientImpl = exports.RawData = exports.AppsStatus_AppsStatusEntry = exports.AppsStatus = exports.InstancesStatus_InstancesStatusEntry = exports.InstancesStatus = exports.StatusInfo = exports.AppMetadataArray = exports.AppMetadata = exports.QueryRequest = exports.AppIdList = exports.DeleteRequest = exports.InstanceInfo = exports.AppId = exports.ListOptRequest = exports.statusInfo_StatusTypeToJSON = exports.statusInfo_StatusTypeFromJSON = exports.StatusInfo_StatusType = exports.listOptTypeToJSON = exports.listOptTypeFromJSON = exports.ListOptType = void 0;
 /* eslint-disable */
 const grpc_web_1 = require("@improbable-eng/grpc-web");
 const browser_headers_1 = require("browser-headers");
@@ -56,11 +56,16 @@ var StatusInfo_StatusType;
 (function (StatusInfo_StatusType) {
     StatusInfo_StatusType[StatusInfo_StatusType["STOPPED"] = 0] = "STOPPED";
     StatusInfo_StatusType[StatusInfo_StatusType["STOPPING"] = 1] = "STOPPING";
+    StatusInfo_StatusType[StatusInfo_StatusType["BUILDING"] = 2] = "BUILDING";
+    StatusInfo_StatusType[StatusInfo_StatusType["DOWNLOADING"] = 3] = "DOWNLOADING";
+    StatusInfo_StatusType[StatusInfo_StatusType["HOOKING"] = 4] = "HOOKING";
     StatusInfo_StatusType[StatusInfo_StatusType["STARTING"] = 5] = "STARTING";
     StatusInfo_StatusType[StatusInfo_StatusType["RUNNING"] = 6] = "RUNNING";
+    StatusInfo_StatusType[StatusInfo_StatusType["INSUFFICIENT"] = 7] = "INSUFFICIENT";
     StatusInfo_StatusType[StatusInfo_StatusType["PAUSED"] = 8] = "PAUSED";
+    StatusInfo_StatusType[StatusInfo_StatusType["DEAD"] = 9] = "DEAD";
     StatusInfo_StatusType[StatusInfo_StatusType["ERROR"] = 10] = "ERROR";
-    StatusInfo_StatusType[StatusInfo_StatusType["NEED_SETUP"] = 12] = "NEED_SETUP";
+    StatusInfo_StatusType[StatusInfo_StatusType["DISABLED"] = 11] = "DISABLED";
     StatusInfo_StatusType[StatusInfo_StatusType["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
 })(StatusInfo_StatusType = exports.StatusInfo_StatusType || (exports.StatusInfo_StatusType = {}));
 function statusInfo_StatusTypeFromJSON(object) {
@@ -71,21 +76,36 @@ function statusInfo_StatusTypeFromJSON(object) {
         case 1:
         case "STOPPING":
             return StatusInfo_StatusType.STOPPING;
+        case 2:
+        case "BUILDING":
+            return StatusInfo_StatusType.BUILDING;
+        case 3:
+        case "DOWNLOADING":
+            return StatusInfo_StatusType.DOWNLOADING;
+        case 4:
+        case "HOOKING":
+            return StatusInfo_StatusType.HOOKING;
         case 5:
         case "STARTING":
             return StatusInfo_StatusType.STARTING;
         case 6:
         case "RUNNING":
             return StatusInfo_StatusType.RUNNING;
+        case 7:
+        case "INSUFFICIENT":
+            return StatusInfo_StatusType.INSUFFICIENT;
         case 8:
         case "PAUSED":
             return StatusInfo_StatusType.PAUSED;
+        case 9:
+        case "DEAD":
+            return StatusInfo_StatusType.DEAD;
         case 10:
         case "ERROR":
             return StatusInfo_StatusType.ERROR;
-        case 12:
-        case "NEED_SETUP":
-            return StatusInfo_StatusType.NEED_SETUP;
+        case 11:
+        case "DISABLED":
+            return StatusInfo_StatusType.DISABLED;
         case -1:
         case "UNRECOGNIZED":
         default:
@@ -99,16 +119,26 @@ function statusInfo_StatusTypeToJSON(object) {
             return "STOPPED";
         case StatusInfo_StatusType.STOPPING:
             return "STOPPING";
+        case StatusInfo_StatusType.BUILDING:
+            return "BUILDING";
+        case StatusInfo_StatusType.DOWNLOADING:
+            return "DOWNLOADING";
+        case StatusInfo_StatusType.HOOKING:
+            return "HOOKING";
         case StatusInfo_StatusType.STARTING:
             return "STARTING";
         case StatusInfo_StatusType.RUNNING:
             return "RUNNING";
+        case StatusInfo_StatusType.INSUFFICIENT:
+            return "INSUFFICIENT";
         case StatusInfo_StatusType.PAUSED:
             return "PAUSED";
+        case StatusInfo_StatusType.DEAD:
+            return "DEAD";
         case StatusInfo_StatusType.ERROR:
             return "ERROR";
-        case StatusInfo_StatusType.NEED_SETUP:
-            return "NEED_SETUP";
+        case StatusInfo_StatusType.DISABLED:
+            return "DISABLED";
         case StatusInfo_StatusType.UNRECOGNIZED:
         default:
             return "UNRECOGNIZED";
@@ -151,9 +181,7 @@ exports.ListOptRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.opt !== 0) {
-            obj.opt = listOptTypeToJSON(message.opt);
-        }
+        message.opt !== undefined && (obj.opt = listOptTypeToJSON(message.opt));
         return obj;
     },
     create(base) {
@@ -202,9 +230,7 @@ exports.AppId = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.AppId !== "") {
-            obj.AppId = message.AppId;
-        }
+        message.AppId !== undefined && (obj.AppId = message.AppId);
         return obj;
     },
     create(base) {
@@ -265,12 +291,8 @@ exports.InstanceInfo = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.AppId !== "") {
-            obj.AppId = message.AppId;
-        }
-        if (message.UserId !== "") {
-            obj.UserId = message.UserId;
-        }
+        message.AppId !== undefined && (obj.AppId = message.AppId);
+        message.UserId !== undefined && (obj.UserId = message.UserId);
         return obj;
     },
     create(base) {
@@ -332,12 +354,8 @@ exports.DeleteRequest = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.AppId !== "") {
-            obj.AppId = message.AppId;
-        }
-        if (message.DeleteAllData === true) {
-            obj.DeleteAllData = message.DeleteAllData;
-        }
+        message.AppId !== undefined && (obj.AppId = message.AppId);
+        message.DeleteAllData !== undefined && (obj.DeleteAllData = message.DeleteAllData);
         return obj;
     },
     create(base) {
@@ -386,10 +404,12 @@ exports.AppIdList = {
         return { appIdList: Array.isArray(object === null || object === void 0 ? void 0 : object.appIdList) ? object.appIdList.map((e) => String(e)) : [] };
     },
     toJSON(message) {
-        var _a;
         const obj = {};
-        if ((_a = message.appIdList) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.appIdList = message.appIdList;
+        if (message.appIdList) {
+            obj.appIdList = message.appIdList.map((e) => e);
+        }
+        else {
+            obj.appIdList = [];
         }
         return obj;
     },
@@ -450,14 +470,14 @@ exports.QueryRequest = {
         };
     },
     toJSON(message) {
-        var _a;
         const obj = {};
-        if ((_a = message.appIdList) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.appIdList = message.appIdList;
+        if (message.appIdList) {
+            obj.appIdList = message.appIdList.map((e) => e);
         }
-        if (message.opt !== 0) {
-            obj.opt = listOptTypeToJSON(message.opt);
+        else {
+            obj.appIdList = [];
         }
+        message.opt !== undefined && (obj.opt = listOptTypeToJSON(message.opt));
         return obj;
     },
     create(base) {
@@ -472,7 +492,7 @@ exports.QueryRequest = {
     },
 };
 function createBaseAppMetadata() {
-    return { id: "", system: false, mutliInstance: false, version: "" };
+    return { id: "", system: false, userApp: false, version: "" };
 }
 exports.AppMetadata = {
     encode(message, writer = minimal_1.default.Writer.create()) {
@@ -482,8 +502,8 @@ exports.AppMetadata = {
         if (message.system === true) {
             writer.uint32(16).bool(message.system);
         }
-        if (message.mutliInstance === true) {
-            writer.uint32(24).bool(message.mutliInstance);
+        if (message.userApp === true) {
+            writer.uint32(24).bool(message.userApp);
         }
         if (message.version !== "") {
             writer.uint32(34).string(message.version);
@@ -513,7 +533,7 @@ exports.AppMetadata = {
                     if (tag !== 24) {
                         break;
                     }
-                    message.mutliInstance = reader.bool();
+                    message.userApp = reader.bool();
                     continue;
                 case 4:
                     if (tag !== 34) {
@@ -533,24 +553,16 @@ exports.AppMetadata = {
         return {
             id: isSet(object.id) ? String(object.id) : "",
             system: isSet(object.system) ? Boolean(object.system) : false,
-            mutliInstance: isSet(object.mutliInstance) ? Boolean(object.mutliInstance) : false,
+            userApp: isSet(object.userApp) ? Boolean(object.userApp) : false,
             version: isSet(object.version) ? String(object.version) : "",
         };
     },
     toJSON(message) {
         const obj = {};
-        if (message.id !== "") {
-            obj.id = message.id;
-        }
-        if (message.system === true) {
-            obj.system = message.system;
-        }
-        if (message.mutliInstance === true) {
-            obj.mutliInstance = message.mutliInstance;
-        }
-        if (message.version !== "") {
-            obj.version = message.version;
-        }
+        message.id !== undefined && (obj.id = message.id);
+        message.system !== undefined && (obj.system = message.system);
+        message.userApp !== undefined && (obj.userApp = message.userApp);
+        message.version !== undefined && (obj.version = message.version);
         return obj;
     },
     create(base) {
@@ -561,7 +573,7 @@ exports.AppMetadata = {
         const message = createBaseAppMetadata();
         message.id = (_a = object.id) !== null && _a !== void 0 ? _a : "";
         message.system = (_b = object.system) !== null && _b !== void 0 ? _b : false;
-        message.mutliInstance = (_c = object.mutliInstance) !== null && _c !== void 0 ? _c : false;
+        message.userApp = (_c = object.userApp) !== null && _c !== void 0 ? _c : false;
         message.version = (_d = object.version) !== null && _d !== void 0 ? _d : "";
         return message;
     },
@@ -603,10 +615,12 @@ exports.AppMetadataArray = {
         };
     },
     toJSON(message) {
-        var _a;
         const obj = {};
-        if ((_a = message.metadata) === null || _a === void 0 ? void 0 : _a.length) {
-            obj.metadata = message.metadata.map((e) => exports.AppMetadata.toJSON(e));
+        if (message.metadata) {
+            obj.metadata = message.metadata.map((e) => e ? exports.AppMetadata.toJSON(e) : undefined);
+        }
+        else {
+            obj.metadata = [];
         }
         return obj;
     },
@@ -668,12 +682,8 @@ exports.StatusInfo = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.status !== 0) {
-            obj.status = statusInfo_StatusTypeToJSON(message.status);
-        }
-        if (message.errMsg !== "") {
-            obj.errMsg = message.errMsg;
-        }
+        message.status !== undefined && (obj.status = statusInfo_StatusTypeToJSON(message.status));
+        message.errMsg !== undefined && (obj.errMsg = message.errMsg);
         return obj;
     },
     create(base) {
@@ -733,14 +743,11 @@ exports.InstancesStatus = {
     },
     toJSON(message) {
         const obj = {};
+        obj.instancesStatus = {};
         if (message.instancesStatus) {
-            const entries = Object.entries(message.instancesStatus);
-            if (entries.length > 0) {
-                obj.instancesStatus = {};
-                entries.forEach(([k, v]) => {
-                    obj.instancesStatus[k] = exports.StatusInfo.toJSON(v);
-                });
-            }
+            Object.entries(message.instancesStatus).forEach(([k, v]) => {
+                obj.instancesStatus[k] = exports.StatusInfo.toJSON(v);
+            });
         }
         return obj;
     },
@@ -807,12 +814,8 @@ exports.InstancesStatus_InstancesStatusEntry = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.key !== "") {
-            obj.key = message.key;
-        }
-        if (message.value !== undefined) {
-            obj.value = exports.StatusInfo.toJSON(message.value);
-        }
+        message.key !== undefined && (obj.key = message.key);
+        message.value !== undefined && (obj.value = message.value ? exports.StatusInfo.toJSON(message.value) : undefined);
         return obj;
     },
     create(base) {
@@ -874,14 +877,11 @@ exports.AppsStatus = {
     },
     toJSON(message) {
         const obj = {};
+        obj.appsStatus = {};
         if (message.appsStatus) {
-            const entries = Object.entries(message.appsStatus);
-            if (entries.length > 0) {
-                obj.appsStatus = {};
-                entries.forEach(([k, v]) => {
-                    obj.appsStatus[k] = exports.InstancesStatus.toJSON(v);
-                });
-            }
+            Object.entries(message.appsStatus).forEach(([k, v]) => {
+                obj.appsStatus[k] = exports.InstancesStatus.toJSON(v);
+            });
         }
         return obj;
     },
@@ -948,12 +948,8 @@ exports.AppsStatus_AppsStatusEntry = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.key !== "") {
-            obj.key = message.key;
-        }
-        if (message.value !== undefined) {
-            obj.value = exports.InstancesStatus.toJSON(message.value);
-        }
+        message.key !== undefined && (obj.key = message.key);
+        message.value !== undefined && (obj.value = message.value ? exports.InstancesStatus.toJSON(message.value) : undefined);
         return obj;
     },
     create(base) {
@@ -1005,9 +1001,8 @@ exports.RawData = {
     },
     toJSON(message) {
         const obj = {};
-        if (message.data.length !== 0) {
-            obj.data = base64FromBytes(message.data);
-        }
+        message.data !== undefined &&
+            (obj.data = base64FromBytes(message.data !== undefined ? message.data : new Uint8Array(0)));
         return obj;
     },
     create(base) {
@@ -1027,7 +1022,6 @@ class CoreSystemClientImpl {
         this.Apply = this.Apply.bind(this);
         this.Apply2 = this.Apply2.bind(this);
         this.Apply3 = this.Apply3.bind(this);
-        this.ApplyLpk = this.ApplyLpk.bind(this);
         this.Remove = this.Remove.bind(this);
         this.Disable = this.Disable.bind(this);
         this.Enable = this.Enable.bind(this);
@@ -1040,53 +1034,50 @@ class CoreSystemClientImpl {
         this.InstancePause = this.InstancePause.bind(this);
         this.InstanceResume = this.InstanceResume.bind(this);
     }
-    List(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemListDesc, exports.ListOptRequest.fromPartial(request), metadata, abortSignal);
-    }
-    Apply(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemApplyDesc, exports.RawData.fromPartial(request), metadata, abortSignal);
+    List(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemListDesc, exports.ListOptRequest.fromPartial(request), metadata);
     }
-    Apply2(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemApply2Desc, package_manager_1.PkgURL.fromPartial(request), metadata, abortSignal);
+    Apply(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemApplyDesc, exports.RawData.fromPartial(request), metadata);
     }
-    Apply3(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemApply3Desc, package_manager_1.PkgURL.fromPartial(request), metadata, abortSignal);
+    Apply2(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemApply2Desc, package_manager_1.PkgURL.fromPartial(request), metadata);
     }
-    ApplyLpk(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemApplyLpkDesc, package_manager_1.PkgURL.fromPartial(request), metadata, abortSignal);
+    Apply3(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemApply3Desc, package_manager_1.PkgURL.fromPartial(request), metadata);
     }
-    Remove(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemRemoveDesc, exports.DeleteRequest.fromPartial(request), metadata, abortSignal);
+    Remove(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemRemoveDesc, exports.DeleteRequest.fromPartial(request), metadata);
     }
-    Disable(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemDisableDesc, exports.QueryRequest.fromPartial(request), metadata, abortSignal);
+    Disable(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemDisableDesc, exports.QueryRequest.fromPartial(request), metadata);
     }
-    Enable(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemEnableDesc, exports.QueryRequest.fromPartial(request), metadata, abortSignal);
+    Enable(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemEnableDesc, exports.QueryRequest.fromPartial(request), metadata);
     }
-    Query(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemQueryDesc, exports.QueryRequest.fromPartial(request), metadata, abortSignal);
+    Query(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemQueryDesc, exports.QueryRequest.fromPartial(request), metadata);
     }
-    Status(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemStatusDesc, empty_1.Empty.fromPartial(request), metadata, abortSignal);
+    Status(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemStatusDesc, empty_1.Empty.fromPartial(request), metadata);
     }
-    AppStatus(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemAppStatusDesc, exports.AppId.fromPartial(request), metadata, abortSignal);
+    AppStatus(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemAppStatusDesc, exports.AppId.fromPartial(request), metadata);
     }
-    InstanceStatus(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemInstanceStatusDesc, exports.InstanceInfo.fromPartial(request), metadata, abortSignal);
+    InstanceStatus(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemInstanceStatusDesc, exports.InstanceInfo.fromPartial(request), metadata);
     }
-    InstanceAdd(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemInstanceAddDesc, exports.InstanceInfo.fromPartial(request), metadata, abortSignal);
+    InstanceAdd(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemInstanceAddDesc, exports.InstanceInfo.fromPartial(request), metadata);
     }
-    InstanceRemove(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemInstanceRemoveDesc, exports.InstanceInfo.fromPartial(request), metadata, abortSignal);
+    InstanceRemove(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemInstanceRemoveDesc, exports.InstanceInfo.fromPartial(request), metadata);
     }
-    InstancePause(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemInstancePauseDesc, exports.InstanceInfo.fromPartial(request), metadata, abortSignal);
+    InstancePause(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemInstancePauseDesc, exports.InstanceInfo.fromPartial(request), metadata);
     }
-    InstanceResume(request, metadata, abortSignal) {
-        return this.rpc.unary(exports.CoreSystemInstanceResumeDesc, exports.InstanceInfo.fromPartial(request), metadata, abortSignal);
+    InstanceResume(request, metadata) {
+        return this.rpc.unary(exports.CoreSystemInstanceResumeDesc, exports.InstanceInfo.fromPartial(request), metadata);
     }
 }
 exports.CoreSystemClientImpl = CoreSystemClientImpl;
@@ -1167,25 +1158,6 @@ exports.CoreSystemApply3Desc = {
         },
     },
 };
-exports.CoreSystemApplyLpkDesc = {
-    methodName: "ApplyLpk",
-    service: exports.CoreSystemDesc,
-    requestStream: false,
-    responseStream: false,
-    requestType: {
-        serializeBinary() {
-            return package_manager_1.PkgURL.encode(this).finish();
-        },
-    },
-    responseType: {
-        deserializeBinary(data) {
-            const value = empty_1.Empty.decode(data);
-            return Object.assign(Object.assign({}, value), { toObject() {
-                    return value;
-                } });
-        },
-    },
-};
 exports.CoreSystemRemoveDesc = {
     methodName: "Remove",
     service: exports.CoreSystemDesc,
@@ -1400,15 +1372,20 @@ class GrpcWebImpl {
         this.host = host;
         this.options = options;
     }
-    unary(methodDesc, _request, metadata, abortSignal) {
+    unary(methodDesc, _request, metadata) {
         var _a;
         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) {
+            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());
                     }
@@ -1416,18 +1393,13 @@ class GrpcWebImpl {
                         const err = new GrpcWebError(response.statusMessage, response.status, response.trailers);
                         reject(err);
                     }
-                } }));
-            if (abortSignal) {
-                abortSignal.addEventListener("abort", () => {
-                    client.close();
-                    reject(abortSignal.reason);
-                });
-            }
+                },
+            });
         });
     }
 }
 exports.GrpcWebImpl = GrpcWebImpl;
-const tsProtoGlobalThis = (() => {
+var tsProtoGlobalThis = (() => {
     if (typeof globalThis !== "undefined") {
         return globalThis;
     }