@larksuiteoapi/node-sdk 1.57.0-beta.1 → 1.58.0

package/es/index.js

@@ -83983,17 +83983,16 @@ class Client extends Client$1 {
                 const helpDeskCredential = string2Base64(`${this.helpDeskId}:${this.helpDeskToken}`);
                 targetOptions.headers['X-Lark-Helpdesk-Authorization'] = `Bearer ${helpDeskCredential}`;
             }
-            const payloadData = Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.data) || {})), targetOptions.data);
             return {
                 params: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.params) || {})), targetOptions.params),
                 headers: Object.assign(Object.assign({ 'User-Agent': 'oapi-node-sdk/1.0.0' }, ((payload === null || payload === void 0 ? void 0 : payload.headers) || {})), targetOptions.headers),
-                // @ts-ignore
-                data: Object.keys(payloadData).length === 0 ? undefined : payloadData,
+                data: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.data) || {})), targetOptions.data),
                 path: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.path) || {})), targetOptions.path),
             };
         });
     }
     request(payload, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { data, params, headers, url } = payload, rest = __rest(payload, ["data", "params", "headers", "url"]);
             const formatPayload = yield this.formatPayload({
@@ -84001,6 +84000,8 @@ class Client extends Client$1 {
                 params,
                 headers,
             }, options);
+            // fix: #153
+            const targetData = (((_a = payload.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'get' && Object.keys(formatPayload.data).length === 0) ? undefined : formatPayload.data;
             this.logger.trace(`send request [${payload.method}]: ${payload.url}`);
             const res = yield this.httpInstance
                 .request(Object.assign(Object.assign({}, rest), {
@@ -84008,7 +84009,7 @@ class Client extends Client$1 {
                     ? url
                     : `${this.domain}/${formatUrl(url)}`,
                 headers: formatPayload.headers,
-                data: formatPayload.data,
+                data: targetData,
                 params: formatPayload.params,
             }))
                 .catch((e) => {
@@ -85570,6 +85571,35 @@ class WSClient {
     getReconnectInfo() {
         return this.reconnectInfo;
     }
+    /**
+     * close connection
+     * @param params close params
+     * @param params.force whether force close (use terminate instead of close)
+     */
+    close(params = {}) {
+        const { force = false } = params;
+        if (this.pingInterval) {
+            clearTimeout(this.pingInterval);
+            this.pingInterval = undefined;
+        }
+        if (this.reconnectInterval) {
+            clearTimeout(this.reconnectInterval);
+            this.reconnectInterval = undefined;
+        }
+        this.isConnecting = false;
+        const wsInstance = this.wsConfig.getWSInstance();
+        if (wsInstance) {
+            wsInstance.removeAllListeners();
+            if (force) {
+                wsInstance.terminate();
+            }
+            else {
+                wsInstance.close();
+            }
+            this.wsConfig.setWSInstance(null);
+        }
+        this.logger.info('[ws]', `ws client closed manually${force ? ' (force)' : ''}`);
+    }
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.info('[ws]', `receive events or callbacks through persistent connection only available in self-build & Feishu app, Configured in:

package/lib/index.js

@@ -83998,17 +83998,16 @@ class Client extends Client$1 {
                 const helpDeskCredential = string2Base64(`${this.helpDeskId}:${this.helpDeskToken}`);
                 targetOptions.headers['X-Lark-Helpdesk-Authorization'] = `Bearer ${helpDeskCredential}`;
             }
-            const payloadData = Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.data) || {})), targetOptions.data);
             return {
                 params: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.params) || {})), targetOptions.params),
                 headers: Object.assign(Object.assign({ 'User-Agent': 'oapi-node-sdk/1.0.0' }, ((payload === null || payload === void 0 ? void 0 : payload.headers) || {})), targetOptions.headers),
-                // @ts-ignore
-                data: Object.keys(payloadData).length === 0 ? undefined : payloadData,
+                data: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.data) || {})), targetOptions.data),
                 path: Object.assign(Object.assign({}, ((payload === null || payload === void 0 ? void 0 : payload.path) || {})), targetOptions.path),
             };
         });
     }
     request(payload, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { data, params, headers, url } = payload, rest = __rest(payload, ["data", "params", "headers", "url"]);
             const formatPayload = yield this.formatPayload({
@@ -84016,6 +84015,8 @@ class Client extends Client$1 {
                 params,
                 headers,
             }, options);
+            // fix: #153
+            const targetData = (((_a = payload.method) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'get' && Object.keys(formatPayload.data).length === 0) ? undefined : formatPayload.data;
             this.logger.trace(`send request [${payload.method}]: ${payload.url}`);
             const res = yield this.httpInstance
                 .request(Object.assign(Object.assign({}, rest), {
@@ -84023,7 +84024,7 @@ class Client extends Client$1 {
                     ? url
                     : `${this.domain}/${formatUrl(url)}`,
                 headers: formatPayload.headers,
-                data: formatPayload.data,
+                data: targetData,
                 params: formatPayload.params,
             }))
                 .catch((e) => {
@@ -85585,6 +85586,35 @@ class WSClient {
     getReconnectInfo() {
         return this.reconnectInfo;
     }
+    /**
+     * close connection
+     * @param params close params
+     * @param params.force whether force close (use terminate instead of close)
+     */
+    close(params = {}) {
+        const { force = false } = params;
+        if (this.pingInterval) {
+            clearTimeout(this.pingInterval);
+            this.pingInterval = undefined;
+        }
+        if (this.reconnectInterval) {
+            clearTimeout(this.reconnectInterval);
+            this.reconnectInterval = undefined;
+        }
+        this.isConnecting = false;
+        const wsInstance = this.wsConfig.getWSInstance();
+        if (wsInstance) {
+            wsInstance.removeAllListeners();
+            if (force) {
+                wsInstance.terminate();
+            }
+            else {
+                wsInstance.close();
+            }
+            this.wsConfig.setWSInstance(null);
+        }
+        this.logger.info('[ws]', `ws client closed manually${force ? ' (force)' : ''}`);
+    }
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.info('[ws]', `receive events or callbacks through persistent connection only available in self-build & Feishu app, Configured in:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larksuiteoapi/node-sdk",
-  "version": "1.57.0-beta.1",
+  "version": "1.58.0",
   "description": "larksuite open sdk for nodejs",
   "keywords": [
     "feishu",

package/types/index.d.ts

@@ -293072,6 +293072,14 @@ declare class WSClient {
         lastConnectTime: number;
         nextConnectTime: number;
     };
+    /**
+     * close connection
+     * @param params close params
+     * @param params.force whether force close (use terminate instead of close)
+     */
+    close(params?: {
+        force?: boolean;
+    }): void;
     start(params: {
         eventDispatcher: EventDispatcher;
     }): Promise<void>;