@lumiastream/tapo-cove 3.0.11 → 3.0.13

package/dist/index.d.ts

@@ -69,11 +69,14 @@ type TapoDeviceKey = {
 declare class TapoApi {
     _baseUrl: string;
     _baseTapoCareUrl: string;
+    private axiosInstance;
     private _config;
     private _token;
     private _devices;
     constructor(config?: {
         token?: string;
+        timeout?: number;
+        httpTimeout?: number;
     });
     auth: ({ email, password }: {
         email: string;

package/dist/index.js

@@ -72,8 +72,8 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/discovery.ts
-var import_fetch_cove3 = require("@lumiastream/fetch-cove");
 var import_lumia_rgb_types = require("@lumiastream/lumia-rgb-types");
+var import_axios3 = __toESM(require("axios"));
 var import_local_devices = __toESM(require("local-devices"));
 
 // src/shared/cipher.ts
@@ -134,7 +134,7 @@ var shaDigest = (data) => {
 };
 
 // src/shared/helpers.ts
-var import_fetch_cove = require("@lumiastream/fetch-cove");
+var import_axios = __toESM(require("axios"));
 var throwErrorIfFound = (responseData) => {
   const errorCode = responseData["error_code"];
   if (errorCode) {
@@ -163,6 +163,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
+  var _a, _b, _c;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -170,21 +171,15 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
       key: keyPair.publicKey
     }
   };
-  const response = yield (0, import_fetch_cove.fetchWork)({
+  const response = yield (0, import_axios.default)({
+    method: "post",
     url: `http://${deviceIp}/app`,
-    data: {
-      method: "POST",
-      body: handshakeRequest
-    },
-    shouldWait: true,
-    fullResponse: true
+    data: handshakeRequest
   });
-  const data = yield response.json();
-  throwErrorIfFound(data);
-  const setCookieHeader = response.headers.get("set-cookie");
-  console.log("setCookieHeader: ", setCookieHeader);
+  throwErrorIfFound(response.data);
+  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");
   const sessionCookie = setCookieHeader.substring(0, setCookieHeader.indexOf(";"));
-  const deviceKey = readDeviceKey(data.result.key, keyPair.privateKey);
+  const deviceKey = readDeviceKey(response.data.result.key, keyPair.privateKey);
   return {
     key: deviceKey.subarray(0, 16),
     iv: deviceKey.subarray(16, 32),
@@ -200,24 +195,23 @@ var securePassthrough = (deviceRequest, deviceKey) => __async(void 0, null, func
       request: encryptedRequest
     }
   };
-  const data = yield (0, import_fetch_cove.fetchWork)({
+  const response = yield (0, import_axios.default)({
+    method: "post",
     url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-    data: {
-      method: "POST",
-      body: securePassthroughRequest,
-      headers: {
-        Cookie: deviceKey.sessionCookie
-      }
-    },
-    shouldWait: true
+    data: securePassthroughRequest,
+    headers: {
+      Cookie: deviceKey.sessionCookie
+    }
   });
-  throwErrorIfFound(data);
-  console.log("data: ", data);
-  const decryptedResponse = decrypt(data.result.response, deviceKey);
+  throwErrorIfFound(response.data);
+  const decryptedResponse = decrypt(response.data.result.response, deviceKey);
   throwErrorIfFound(decryptedResponse);
   return decryptedResponse.result;
 });
 
+// src/tapo-api.ts
+var import_axios2 = __toESM(require("axios"));
+
 // src/lightstate.ts
 var import_lumia_rgb_utils = require("@lumiastream/lumia-rgb-utils");
 var SuperState = class {
@@ -333,21 +327,17 @@ var LightState = class extends SuperState {
 };
 
 // src/tapo-api.ts
-var import_fetch_cove2 = require("@lumiastream/fetch-cove");
+var import_fetch_cove = require("@lumiastream/fetch-cove");
 var import_lumia_rgb_utils2 = require("@lumiastream/lumia-rgb-utils");
 var TapoApi = class {
   constructor(config) {
     this._baseUrl = "https://eu-wap.tplinkcloud.com/";
     // https://n-euw1-wap-gw.tplinkcloud.com
     this._baseTapoCareUrl = "https://euw1-app-tapo-care.i.tplinknbu.com";
-    // http://use1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
-    // http://euw1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
-    // http://aps1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
     this._config = {
-      authToken: null
+      authToken: null,
+      timeout: 1e4,
+      httpTimeout: 4e3
     };
     this._token = "";
     this._devices = /* @__PURE__ */ new Map();
@@ -361,16 +351,13 @@ var TapoApi = class {
           terminalUUID: (0, import_lumia_rgb_utils2.uuidv4)()
         }
       };
-      const data = yield (0, import_fetch_cove2.fetchWork)({
+      const response = yield (0, import_axios2.default)({
+        method: "post",
         url: this._baseUrl,
-        data: {
-          method: "POST",
-          body: loginRequest
-        },
-        shouldWait: true
+        data: loginRequest
       });
-      throwErrorIfFound(data);
-      this._token = data.result.token;
+      throwErrorIfFound(response.data);
+      this._token = response.data.result.token;
       return this._token;
     });
     this.setup = (_0) => __async(this, [_0], function* ({ email, password, devices }) {
@@ -415,7 +402,7 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      return (0, import_fetch_cove2.fetchWork)({
+      return (0, import_fetch_cove.fetchWork)({
         url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
         data: {
           method: "POST",
@@ -430,6 +417,8 @@ var TapoApi = class {
     this.sendPower = (config) => {
       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;
     this._config = __spreadValues(__spreadValues({}, this._config), config);
   }
 };
@@ -445,18 +434,15 @@ var discover = (config) => __async(void 0, null, function* () {
   const getDeviceRequest = {
     method: "getDeviceList"
   };
-  const data = yield (0, import_fetch_cove3.fetchWork)({
+  const response = yield (0, import_axios3.default)({
+    method: "post",
     url: `${api._baseUrl}?token=${token}`,
-    data: {
-      method: "POST",
-      body: getDeviceRequest
-    },
-    shouldWait: true
+    data: getDeviceRequest
   });
-  throwErrorIfFound(data);
+  throwErrorIfFound(response.data);
   const devices = [];
   const localDevices = yield (0, import_local_devices.default)({ skipNameResolution: true });
-  (_a = data.result) == null ? void 0 : _a.deviceList.map((deviceInfo) => __async(void 0, null, function* () {
+  (_a = response.data.result) == null ? void 0 : _a.deviceList.map((deviceInfo) => __async(void 0, null, function* () {
     var _a2, _b;
     if (!deviceInfo.ip) {
       const findableMac = deviceInfo.deviceMac.replace(/:/g, "").toUpperCase();

package/dist/index.mjs

@@ -40,8 +40,8 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/discovery.ts
-import { fetchWork as fetchWork3 } from "@lumiastream/fetch-cove";
 import { ILumiaDeviceBrands, ILumiaDeviceConnectionType, ILumiaDeviceType } from "@lumiastream/lumia-rgb-types";
+import Axios from "axios";
 import findLocalDevices from "local-devices";
 
 // src/shared/cipher.ts
@@ -102,7 +102,7 @@ var shaDigest = (data) => {
 };
 
 // src/shared/helpers.ts
-import { fetchWork } from "@lumiastream/fetch-cove";
+import axios from "axios";
 var throwErrorIfFound = (responseData) => {
   const errorCode = responseData["error_code"];
   if (errorCode) {
@@ -131,6 +131,7 @@ var throwErrorIfFound = (responseData) => {
   }
 };
 var handshake = (deviceIp) => __async(void 0, null, function* () {
+  var _a, _b, _c;
   const keyPair = yield generateKeyPair();
   const handshakeRequest = {
     method: "handshake",
@@ -138,21 +139,15 @@ var handshake = (deviceIp) => __async(void 0, null, function* () {
       key: keyPair.publicKey
     }
   };
-  const response = yield fetchWork({
+  const response = yield axios({
+    method: "post",
     url: `http://${deviceIp}/app`,
-    data: {
-      method: "POST",
-      body: handshakeRequest
-    },
-    shouldWait: true,
-    fullResponse: true
+    data: handshakeRequest
   });
-  const data = yield response.json();
-  throwErrorIfFound(data);
-  const setCookieHeader = response.headers.get("set-cookie");
-  console.log("setCookieHeader: ", setCookieHeader);
+  throwErrorIfFound(response.data);
+  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");
   const sessionCookie = setCookieHeader.substring(0, setCookieHeader.indexOf(";"));
-  const deviceKey = readDeviceKey(data.result.key, keyPair.privateKey);
+  const deviceKey = readDeviceKey(response.data.result.key, keyPair.privateKey);
   return {
     key: deviceKey.subarray(0, 16),
     iv: deviceKey.subarray(16, 32),
@@ -168,24 +163,23 @@ var securePassthrough = (deviceRequest, deviceKey) => __async(void 0, null, func
       request: encryptedRequest
     }
   };
-  const data = yield fetchWork({
+  const response = yield axios({
+    method: "post",
     url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
-    data: {
-      method: "POST",
-      body: securePassthroughRequest,
-      headers: {
-        Cookie: deviceKey.sessionCookie
-      }
-    },
-    shouldWait: true
+    data: securePassthroughRequest,
+    headers: {
+      Cookie: deviceKey.sessionCookie
+    }
   });
-  throwErrorIfFound(data);
-  console.log("data: ", data);
-  const decryptedResponse = decrypt(data.result.response, deviceKey);
+  throwErrorIfFound(response.data);
+  const decryptedResponse = decrypt(response.data.result.response, deviceKey);
   throwErrorIfFound(decryptedResponse);
   return decryptedResponse.result;
 });
 
+// src/tapo-api.ts
+import axios2 from "axios";
+
 // src/lightstate.ts
 import { isTruly, isFunction, rgb2hsv } from "@lumiastream/lumia-rgb-utils";
 var SuperState = class {
@@ -301,21 +295,17 @@ var LightState = class extends SuperState {
 };
 
 // src/tapo-api.ts
-import { fetchWork as fetchWork2 } from "@lumiastream/fetch-cove";
+import { fetchWork } from "@lumiastream/fetch-cove";
 import { uuidv4 } from "@lumiastream/lumia-rgb-utils";
 var TapoApi = class {
   constructor(config) {
     this._baseUrl = "https://eu-wap.tplinkcloud.com/";
     // https://n-euw1-wap-gw.tplinkcloud.com
     this._baseTapoCareUrl = "https://euw1-app-tapo-care.i.tplinknbu.com";
-    // http://use1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
-    // http://euw1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
-    // http://aps1-relay-dcipc.i.tplinknbu.com
-    // http://aps1-relay-dcipc-beta.i.tplinknbu.com
     this._config = {
-      authToken: null
+      authToken: null,
+      timeout: 1e4,
+      httpTimeout: 4e3
     };
     this._token = "";
     this._devices = /* @__PURE__ */ new Map();
@@ -329,16 +319,13 @@ var TapoApi = class {
           terminalUUID: uuidv4()
         }
       };
-      const data = yield fetchWork2({
+      const response = yield axios2({
+        method: "post",
         url: this._baseUrl,
-        data: {
-          method: "POST",
-          body: loginRequest
-        },
-        shouldWait: true
+        data: loginRequest
       });
-      throwErrorIfFound(data);
-      this._token = data.result.token;
+      throwErrorIfFound(response.data);
+      this._token = response.data.result.token;
       return this._token;
     });
     this.setup = (_0) => __async(this, [_0], function* ({ email, password, devices }) {
@@ -383,7 +370,7 @@ var TapoApi = class {
           request: encryptedRequest
         }
       };
-      return fetchWork2({
+      return fetchWork({
         url: `http://${deviceKey.deviceIp}/app?token=${deviceKey.token}`,
         data: {
           method: "POST",
@@ -398,6 +385,8 @@ var TapoApi = class {
     this.sendPower = (config) => {
       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;
     this._config = __spreadValues(__spreadValues({}, this._config), config);
   }
 };
@@ -413,18 +402,15 @@ var discover = (config) => __async(void 0, null, function* () {
   const getDeviceRequest = {
     method: "getDeviceList"
   };
-  const data = yield fetchWork3({
+  const response = yield Axios({
+    method: "post",
     url: `${api._baseUrl}?token=${token}`,
-    data: {
-      method: "POST",
-      body: getDeviceRequest
-    },
-    shouldWait: true
+    data: getDeviceRequest
   });
-  throwErrorIfFound(data);
+  throwErrorIfFound(response.data);
   const devices = [];
   const localDevices = yield findLocalDevices({ skipNameResolution: true });
-  (_a = data.result) == null ? void 0 : _a.deviceList.map((deviceInfo) => __async(void 0, null, function* () {
+  (_a = response.data.result) == null ? void 0 : _a.deviceList.map((deviceInfo) => __async(void 0, null, function* () {
     var _a2, _b;
     if (!deviceInfo.ip) {
       const findableMac = deviceInfo.deviceMac.replace(/:/g, "").toUpperCase();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumiastream/tapo-cove",
-  "version": "3.0.11",
+  "version": "3.0.13",
   "private": false,
   "license": "GPL",
   "main": "dist/index.js",
@@ -11,9 +11,10 @@
     "lint": "tsc"
   },
   "dependencies": {
-    "@lumiastream/fetch-cove": "^3.0.11",
+    "@lumiastream/fetch-cove": "^3.0.9",
     "@lumiastream/lumia-rgb-types": "^3.0.9",
     "@lumiastream/lumia-rgb-utils": "^3.0.9",
+    "axios": "*",
     "local-devices": "^4.0.0"
   },
   "devDependencies": {
@@ -22,5 +23,5 @@
     "tsup": "*",
     "typescript": "*"
   },
-  "gitHead": "e0d45e28250cbf71461ee820b026dca1b2439bf0"
+  "gitHead": "26ece2122a597f779a0733619ee96f1d75a3a19a"
 }