@lumiastream/tapo-cove 3.0.23 → 3.1.1

package/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [3.1.1](https://github.com/lumiastream/rgb/compare/v3.1.0...v3.1.1) (2023-03-22)
+
+### Bug Fixes
+
+-   tapo bypass cookie ([39f5dec](https://github.com/lumiastream/rgb/commit/39f5dec51c403d7b99f662b75f4c32a76546e56a))
+
+# [3.1.0](https://github.com/lumiastream/rgb/compare/v3.0.15...v3.1.0) (2023-03-21)
+
+### Bug Fixes
+
+-   tapo using promise.all instead of allsettled ([a6dc480](https://github.com/lumiastream/rgb/commit/a6dc480f86cc129535b6eac7bf1acdc5cdff06b6))

package/dist/index.d.ts

@@ -96,7 +96,6 @@ declare class TapoApi {
         };
         state: LightState;
         fetchConfig?: {
-            useAxios: boolean;
             shouldWait: boolean;
         };
     }) => Promise<any>;
@@ -105,10 +104,6 @@ declare class TapoApi {
             id: string;
         };
         power: boolean;
-        fetchConfig?: {
-            useAxios: boolean;
-            shouldWait: boolean;
-        };
     }) => void;
 }
 

package/dist/index.js

@@ -163,6 +163,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
+  var _a, _b, _c, _d;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -170,7 +171,7 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
       key: keyPair.publicKey
     }
   };
-  const response = yield (0, import_axios.default)({
+  const response = yield (globalThis.nodeAxios ? globalThis.nodeAxios : import_axios.default)({
     method: "post",
     url: `http://${deviceIp}/app`,
     data: handshakeRequest
@@ -178,9 +179,9 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
   throwErrorIfFound(response.data);
   let setCookieHeader;
   if (response.headers["set-cookie"]) {
-    setCookieHeader = Array.isArray(response.headers["set-cookie"]) ? response.headers["set-cookie"][0] : response.headers["set-cookie"];
+    setCookieHeader = (_b = (_a = response.headers["set-cookie"]) == null ? void 0 : _a[0]) != null ? _b : response.headers["set-cookie"];
   } else if (response.headers["bypass-cookie"]) {
-    setCookieHeader = Array.isArray(response.headers["bypass-cookie"]) ? response.headers["bypass-cookie"][0] : response.headers["bypass-cookie"];
+    setCookieHeader = (_d = (_c = response.headers["bypass-cookie"]) == null ? void 0 : _c[0]) != null ? _d : response.headers["bypass-cookie"];
   } else {
     setCookieHeader = response.headers.get("set-cookie");
   }
@@ -206,7 +207,6 @@ var securePassthrough = (deviceRequest, deviceKey) => __async(void 0, null, func
     url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
     data: securePassthroughRequest,
     headers: {
-      BypassCookie: deviceKey.sessionCookie,
       Cookie: deviceKey.sessionCookie
     }
   });
@@ -383,12 +383,11 @@ var TapoApi = class {
         this._devices.set(device.id, deviceKey);
         return;
       }));
-      yield Promise.all(promises);
+      yield Promise.allSettled(promises);
       return this._devices;
     });
     // 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) {
@@ -410,35 +409,21 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      if ((_a = config.fetchConfig) == null ? void 0 : _a.useAxios) {
-        return this.axiosInstance({
-          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-          data: {
-            method: "POST",
-            body: securePassthroughRequest,
-            headers: {
-              BypassCookie: deviceKey.sessionCookie,
-              Cookie: deviceKey.sessionCookie
-            }
+      return (0, import_fetch_cove.fetchWork)({
+        url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+        data: {
+          method: "POST",
+          body: securePassthroughRequest,
+          headers: {
+            Cookie: deviceKey.sessionCookie,
+            BypassCookie: deviceKey.sessionCookie
           }
-        });
-      } else {
-        return (0, import_fetch_cove.fetchWork)({
-          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-          data: {
-            method: "POST",
-            body: securePassthroughRequest,
-            headers: {
-              BypassCookie: deviceKey.sessionCookie,
-              Cookie: deviceKey.sessionCookie
-            }
-          },
-          shouldWait
-        });
-      }
+        },
+        shouldWait
+      });
     };
     this.sendPower = (config) => {
-      this.sendState({ device: config.device, state: new LightState({ on: config.power }), fetchConfig: config.fetchConfig });
+      this.sendState({ device: config.device, state: new LightState({ on: config.power }) });
     };
     this.axiosInstance = import_axios2.default.create();
     this.axiosInstance.defaults.timeout = (config == null ? void 0 : config.httpTimeout) || 4e3;
@@ -476,7 +461,9 @@ var discover = (config) => __async(void 0, null, function* () {
         return;
       }
     }
+    console.log("deviceInfo: ", deviceInfo);
     switch (deviceInfo.deviceType) {
+      case "IOT.SMARTBULB":
       case "SMART.TAPOBULB": {
         if (config.types && !config.types.includes(import_lumia_rgb_types.ILumiaDeviceType.LIGHT)) {
           return;
@@ -504,6 +491,7 @@ var discover = (config) => __async(void 0, null, function* () {
           }
         });
       }
+      case "IOT.SMARTPLUGSWITCH":
       case "SMART.TAPOPLUG": {
         if (config.types && !config.types.includes(import_lumia_rgb_types.ILumiaDeviceType.PLUG)) {
           return;

package/dist/index.mjs

@@ -131,6 +131,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
+  var _a, _b, _c, _d;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -138,7 +139,7 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
       key: keyPair.publicKey
     }
   };
-  const response = yield axios({
+  const response = yield (globalThis.nodeAxios ? globalThis.nodeAxios : axios)({
     method: "post",
     url: `http://${deviceIp}/app`,
     data: handshakeRequest
@@ -146,9 +147,9 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
   throwErrorIfFound(response.data);
   let setCookieHeader;
   if (response.headers["set-cookie"]) {
-    setCookieHeader = Array.isArray(response.headers["set-cookie"]) ? response.headers["set-cookie"][0] : response.headers["set-cookie"];
+    setCookieHeader = (_b = (_a = response.headers["set-cookie"]) == null ? void 0 : _a[0]) != null ? _b : response.headers["set-cookie"];
   } else if (response.headers["bypass-cookie"]) {
-    setCookieHeader = Array.isArray(response.headers["bypass-cookie"]) ? response.headers["bypass-cookie"][0] : response.headers["bypass-cookie"];
+    setCookieHeader = (_d = (_c = response.headers["bypass-cookie"]) == null ? void 0 : _c[0]) != null ? _d : response.headers["bypass-cookie"];
   } else {
     setCookieHeader = response.headers.get("set-cookie");
   }
@@ -174,7 +175,6 @@ var securePassthrough = (deviceRequest, deviceKey) => __async(void 0, null, func
     url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
     data: securePassthroughRequest,
     headers: {
-      BypassCookie: deviceKey.sessionCookie,
       Cookie: deviceKey.sessionCookie
     }
   });
@@ -351,12 +351,11 @@ var TapoApi = class {
         this._devices.set(device.id, deviceKey);
         return;
       }));
-      yield Promise.all(promises);
+      yield Promise.allSettled(promises);
       return this._devices;
     });
     // 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) {
@@ -378,35 +377,21 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      if ((_a = config.fetchConfig) == null ? void 0 : _a.useAxios) {
-        return this.axiosInstance({
-          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-          data: {
-            method: "POST",
-            body: securePassthroughRequest,
-            headers: {
-              BypassCookie: deviceKey.sessionCookie,
-              Cookie: deviceKey.sessionCookie
-            }
+      return fetchWork({
+        url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
+        data: {
+          method: "POST",
+          body: securePassthroughRequest,
+          headers: {
+            Cookie: deviceKey.sessionCookie,
+            BypassCookie: deviceKey.sessionCookie
           }
-        });
-      } else {
-        return fetchWork({
-          url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-          data: {
-            method: "POST",
-            body: securePassthroughRequest,
-            headers: {
-              BypassCookie: deviceKey.sessionCookie,
-              Cookie: deviceKey.sessionCookie
-            }
-          },
-          shouldWait
-        });
-      }
+        },
+        shouldWait
+      });
     };
     this.sendPower = (config) => {
-      this.sendState({ device: config.device, state: new LightState({ on: config.power }), fetchConfig: config.fetchConfig });
+      this.sendState({ device: config.device, state: new LightState({ on: config.power }) });
     };
     this.axiosInstance = axios2.create();
     this.axiosInstance.defaults.timeout = (config == null ? void 0 : config.httpTimeout) || 4e3;
@@ -444,7 +429,9 @@ var discover = (config) => __async(void 0, null, function* () {
         return;
       }
     }
+    console.log("deviceInfo: ", deviceInfo);
     switch (deviceInfo.deviceType) {
+      case "IOT.SMARTBULB":
       case "SMART.TAPOBULB": {
         if (config.types && !config.types.includes(ILumiaDeviceType.LIGHT)) {
           return;
@@ -472,6 +459,7 @@ var discover = (config) => __async(void 0, null, function* () {
           }
         });
       }
+      case "IOT.SMARTPLUGSWITCH":
       case "SMART.TAPOPLUG": {
         if (config.types && !config.types.includes(ILumiaDeviceType.PLUG)) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumiastream/tapo-cove",
-  "version": "3.0.23",
+  "version": "3.1.1",
   "private": false,
   "license": "GPL",
   "main": "dist/index.js",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@lumiastream/fetch-cove": "^3.0.9",
     "@lumiastream/lumia-rgb-types": "^3.0.9",
-    "@lumiastream/lumia-rgb-utils": "^3.0.9",
+    "@lumiastream/lumia-rgb-utils": "^3.1.0",
     "axios": "*",
     "local-devices": "^4.0.0"
   },
@@ -23,5 +23,5 @@
     "tsup": "*",
     "typescript": "*"
   },
-  "gitHead": "8a15e1eb7633c33c8b1121964b76af83af48bbce"
+  "gitHead": "2cdf08ab42cf7e947b6310ca18a1f12116200204"
 }