@lumiastream/tapo-cove 3.0.14 → 3.0.16

package/dist/index.d.ts

@@ -96,6 +96,7 @@ declare class TapoApi {
         };
         state: LightState;
         fetchConfig?: {
+            useAxios: boolean;
             shouldWait: boolean;
         };
     }) => Promise<any>;

package/dist/index.js

@@ -163,7 +163,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
-  var _a, _b, _c;
+  var _a, _b;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -177,8 +177,12 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
     data: handshakeRequest
   });
   throwErrorIfFound(response.data);
-  console.log("response.headers: ", response.headers);
-  const setCookieHeader = (_c = (_b = (_a = response.headers.get("set-cookie")) != null ? _a : response.headers.get("session-cookie")) != null ? _b : response.headers.get("session-key")) != null ? _c : response.headers.get("lumia-session");
+  let setCookieHeader;
+  if (response.headers["set-cookie"]) {
+    setCookieHeader = (_b = (_a = response.headers["set-cookie"]) == null ? void 0 : _a[0]) != null ? _b : response.headers["set-cookie"];
+  } else {
+    setCookieHeader = response.headers.get("set-cookie");
+  }
   const sessionCookie = setCookieHeader.substring(0, setCookieHeader.indexOf(";"));
   const deviceKey = readDeviceKey(response.data.result.key, keyPair.privateKey);
   return {
@@ -382,6 +386,7 @@ var TapoApi = class {
     });
     // Change state using lightstate
     this.sendState = (config) => {
+      var _a;
       const deviceKey = this._devices.get(config.device.id);
       let shouldWait = false;
       if (config.fetchConfig && config.fetchConfig.shouldWait) {
@@ -403,17 +408,30 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      return (0, import_fetch_cove.fetchWork)({
-        url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-        data: {
-          method: "POST",
-          body: securePassthroughRequest,
-          headers: {
-            Cookie: deviceKey.sessionCookie
+      if ((_a = config.fetchConfig) == null ? void 0 : _a.useAxios) {
+        return (0, import_axios2.default)({
+          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+          data: {
+            method: "POST",
+            body: securePassthroughRequest,
+            headers: {
+              Cookie: deviceKey.sessionCookie
+            }
           }
-        },
-        shouldWait
-      });
+        });
+      } else {
+        return (0, import_fetch_cove.fetchWork)({
+          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+          data: {
+            method: "POST",
+            body: securePassthroughRequest,
+            headers: {
+              Cookie: deviceKey.sessionCookie
+            }
+          },
+          shouldWait
+        });
+      }
     };
     this.sendPower = (config) => {
       this.sendState({ device: config.device, state: new LightState({ on: config.power }) });

package/dist/index.mjs

@@ -131,7 +131,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
-  var _a, _b, _c;
+  var _a, _b;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -145,8 +145,12 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
     data: handshakeRequest
   });
   throwErrorIfFound(response.data);
-  console.log("response.headers: ", response.headers);
-  const setCookieHeader = (_c = (_b = (_a = response.headers.get("set-cookie")) != null ? _a : response.headers.get("session-cookie")) != null ? _b : response.headers.get("session-key")) != null ? _c : response.headers.get("lumia-session");
+  let setCookieHeader;
+  if (response.headers["set-cookie"]) {
+    setCookieHeader = (_b = (_a = response.headers["set-cookie"]) == null ? void 0 : _a[0]) != null ? _b : response.headers["set-cookie"];
+  } else {
+    setCookieHeader = response.headers.get("set-cookie");
+  }
   const sessionCookie = setCookieHeader.substring(0, setCookieHeader.indexOf(";"));
   const deviceKey = readDeviceKey(response.data.result.key, keyPair.privateKey);
   return {
@@ -350,6 +354,7 @@ var TapoApi = class {
     });
     // Change state using lightstate
     this.sendState = (config) => {
+      var _a;
       const deviceKey = this._devices.get(config.device.id);
       let shouldWait = false;
       if (config.fetchConfig && config.fetchConfig.shouldWait) {
@@ -371,17 +376,30 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      return fetchWork({
-        url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-        data: {
-          method: "POST",
-          body: securePassthroughRequest,
-          headers: {
-            Cookie: deviceKey.sessionCookie
+      if ((_a = config.fetchConfig) == null ? void 0 : _a.useAxios) {
+        return axios2({
+          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+          data: {
+            method: "POST",
+            body: securePassthroughRequest,
+            headers: {
+              Cookie: deviceKey.sessionCookie
+            }
           }
-        },
-        shouldWait
-      });
+        });
+      } else {
+        return fetchWork({
+          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+          data: {
+            method: "POST",
+            body: securePassthroughRequest,
+            headers: {
+              Cookie: deviceKey.sessionCookie
+            }
+          },
+          shouldWait
+        });
+      }
     };
     this.sendPower = (config) => {
       this.sendState({ device: config.device, state: new LightState({ on: config.power }) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumiastream/tapo-cove",
-  "version": "3.0.14",
+  "version": "3.0.16",
   "private": false,
   "license": "GPL",
   "main": "dist/index.js",
@@ -23,5 +23,5 @@
     "tsup": "*",
     "typescript": "*"
   },
-  "gitHead": "b9daf4a655697189e3399fe4c769a939c269a61e"
+  "gitHead": "eca53cb985b927ddc7e3c886fd2be02e0f2b4bdb"
 }