@cpzxrobot/sdk 1.2.58 → 1.2.60

package/dist/index.js

@@ -22,9 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cpzxrobot = void 0;
 exports.default = default_1;
@@ -32,7 +29,6 @@ const device_gateway_1 = require("./device_gateway");
 const user_gateway_1 = require("./user_gateway");
 const factory_gateway_1 = require("./factory_gateway");
 const transport_gateway_1 = require("./transport_gateway");
-const axios_1 = __importDefault(require("axios"));
 const assistant_gateway_1 = require("./assistant_gateway");
 const energy_gateway_1 = require("./energy_gateway");
 const camera_gateway_1 = require("./camera_gateway");
@@ -99,55 +95,72 @@ class Cpzxrobot {
     }
     initAxios(baseURL) {
         if (this.mode !== "miniapp_in_app") {
-            var instance = axios_1.default.create({
-                baseURL,
-            });
-            instance.interceptors.request.use((config) => {
-                // 在发送请求之前在头部添加token
-                config.headers.Authorization = this.token;
-                // 解析和验证Token
-                return config;
-            }, function (error) {
-                // 对请求错误做些什么
-                return Promise.reject(error);
-            });
-            // @ts-ignore
-            instance.getAndSave = (url, data, fileName) => {
-                var args = Object.assign({ responseType: "blob" }, data);
-                return instance.get(url, args).then((res) => {
-                    this.saveBlob(res.data, fileName || "file");
-                });
+            const fetchWithAuth = async (input, init) => {
+                const headers = new Headers(init === null || init === void 0 ? void 0 : init.headers);
+                headers.set('Authorization', this.token);
+                const response = await fetch(baseURL + input.toString(), Object.assign(Object.assign({}, init), { headers }));
+                if (!response.ok) {
+                    throw new Error(`HTTP error! status: ${response.status}`);
+                }
+                return response;
             };
-            // @ts-ignore
-            instance.getAndPreview = instance.getAndSave;
-            // @ts-ignore
-            instance.upload = (url, option) => {
-                return new Promise((resolve, reject) => {
-                    //add a file button to the body
-                    var button = document.createElement("input");
-                    button.type = "file";
-                    button.style.display = "none";
-                    document.body.appendChild(button);
-                    button.onclick = (e) => {
-                        var _a;
-                        var file = (_a = e.target.files) === null || _a === void 0 ? void 0 : _a[0];
-                        if (file) {
-                            const formData = new FormData();
-                            formData.append((option === null || option === void 0 ? void 0 : option["fileField"]) || "file", file);
-                            for (let key in option === null || option === void 0 ? void 0 : option["data"]) {
-                                formData.append(key, option["data"][key]);
+            const instance = {
+                get: async (url, config) => {
+                    const response = await fetchWithAuth(url, {
+                        method: 'GET',
+                        headers: config === null || config === void 0 ? void 0 : config.headers
+                    });
+                    return { data: await response.json() };
+                },
+                post: async (url, data, config) => {
+                    const response = await fetchWithAuth(url, {
+                        method: 'POST',
+                        headers: Object.assign({ 'Content-Type': 'application/json' }, config === null || config === void 0 ? void 0 : config.headers),
+                        body: JSON.stringify(data)
+                    });
+                    return { data: await response.json() };
+                },
+                getAndSave: async (url, config, fileName) => {
+                    const response = await fetchWithAuth(url, {
+                        method: 'GET',
+                        headers: config === null || config === void 0 ? void 0 : config.headers
+                    });
+                    const blob = await response.blob();
+                    await this.saveBlob(blob, fileName || "file");
+                    return { data: blob };
+                },
+                getAndPreview: async (url, config, fileName) => {
+                    return instance.getAndSave(url, config, fileName);
+                },
+                upload: async (url, option) => {
+                    return new Promise((resolve, reject) => {
+                        const button = document.createElement("input");
+                        button.type = "file";
+                        button.style.display = "none";
+                        document.body.appendChild(button);
+                        button.onclick = async (e) => {
+                            var _a;
+                            const file = (_a = e.target.files) === null || _a === void 0 ? void 0 : _a[0];
+                            if (file) {
+                                const formData = new FormData();
+                                formData.append((option === null || option === void 0 ? void 0 : option["fileField"]) || "file", file);
+                                for (let key in option === null || option === void 0 ? void 0 : option["data"]) {
+                                    formData.append(key, option["data"][key]);
+                                }
+                                const response = await fetchWithAuth(url, {
+                                    method: 'POST',
+                                    body: formData
+                                });
+                                button.remove();
+                                resolve({ data: await response.json() });
                             }
-                            instance.post(url, formData).then((res) => {
+                            else {
                                 button.remove();
-                                resolve(res);
-                            });
-                        }
-                        else {
-                            button.remove();
-                            resolve({ data: { Error: "没有选择文件" } });
-                        }
-                    };
-                });
+                                resolve({ data: { Error: "没有选择文件" } });
+                            }
+                        };
+                    });
+                }
             };
             // @ts-ignore
             this.axios = instance;
@@ -564,7 +577,7 @@ function default_1(args = {
     },
     verbose: false,
 }) {
-    var _a;
+    var _a, _b;
     // @ts-ignore
     var instance = window.single_cpzxrobot_instance;
     if (!instance) {
@@ -572,9 +585,9 @@ function default_1(args = {
         // @ts-ignore
         window.single_cpzxrobot_instance = instance;
         instance.setAuth(args.devAuth, {
-            baseURL: args.baseURL,
+            baseURL: (_a = args.baseURL) !== null && _a !== void 0 ? _a : "",
             verbose: args.verbose,
-            disableFactorySelector: (_a = args.disableFactorySelector) !== null && _a !== void 0 ? _a : false,
+            disableFactorySelector: (_b = args.disableFactorySelector) !== null && _b !== void 0 ? _b : false,
         });
         if (args.selectedFarm) {
             instance.user.selectedFarm = args.selectedFarm;

package/index.ts

@@ -6,7 +6,6 @@ import axios from "axios";
 import { AssistantGateway } from "./assistant_gateway";
 import { EnergyGateway } from "./energy_gateway";
 import { CameraGateway } from "./camera_gateway";
-import { type ElectricMeterRate } from "./energy_types/electric_meter_gateway";
 import { PigfarmGateway } from "./pigfarm_gateway";
 import { Device, Factory, MyAxiosInstance, Unit } from "./types";
 import { UnitGateway } from "./unit_gateway";
@@ -110,62 +109,79 @@ export class Cpzxrobot {
 
   initAxios(baseURL: string) {
     if (this.mode !== "miniapp_in_app") {
-      var instance = axios.create({
-        baseURL,
-      })
-      instance.interceptors.request.use(
-        (config) => {
-          // 在发送请求之前在头部添加token
-          config.headers.Authorization = this.token;
-          // 解析和验证Token
-          return config;
-        },
-        function (error) {
-          // 对请求错误做些什么
-          return Promise.reject(error);
-        }
-      );
-      // @ts-ignore
-      instance.getAndSave = (url: string, data?: any, fileName?: string) => {
-        var args = {
-          responseType: "blob",
-          ...data,
-        };
-        return instance.get(url, args).then((res) => {
-          this.saveBlob(res.data, fileName || "file");
+      const fetchWithAuth = async (input: RequestInfo, init?: RequestInit) => {
+        const headers = new Headers(init?.headers);
+        headers.set('Authorization', this.token);
+        const response = await fetch(baseURL + input.toString(), {
+          ...init,
+          headers
         });
-      }
-      // @ts-ignore
-      instance.getAndPreview = instance.getAndSave;
-      // @ts-ignore
-      instance.upload = (url: string, option?: {
-        [key: string]: any;
-      }) => {
-        return new Promise<any>((resolve, reject) => {
-          //add a file button to the body
-          var button = document.createElement("input");
-          button.type = "file";
-          button.style.display = "none";
-          document.body.appendChild(button);
-          button.onclick = (e: Event) => {
-            var file = (e.target as HTMLInputElement).files?.[0];
-            if (file) {
-              const formData = new FormData();
-              formData.append(option?.["fileField"] || "file", file);
-              for (let key in option?.["data"]) {
-                formData.append(key, option!["data"][key]);
-              }
-              instance.post(url, formData).then((res) => {
+        
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        return response;
+      };
+
+      const instance = {
+        get: async (url: string, config?: any) => {
+          const response = await fetchWithAuth(url, {
+            method: 'GET',
+            headers: config?.headers
+          });
+          return { data: await response.json() };
+        },
+        post: async (url: string, data?: any, config?: any) => {
+          const response = await fetchWithAuth(url, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              ...config?.headers
+            },
+            body: JSON.stringify(data)
+          });
+          return { data: await response.json() };
+        },
+        getAndSave: async (url: string, config?: any, fileName?: string) => {
+          const response = await fetchWithAuth(url, {
+            method: 'GET',
+            headers: config?.headers
+          });
+          const blob = await response.blob();
+          await this.saveBlob(blob, fileName || "file");
+          return { data: blob };
+        },
+        getAndPreview: async (url: string, config?: any, fileName?: string) => {
+          return instance.getAndSave(url, config, fileName);
+        },
+        upload: async (url: string, option?: any) => {
+          return new Promise<any>((resolve, reject) => {
+            const button = document.createElement("input");
+            button.type = "file";
+            button.style.display = "none";
+            document.body.appendChild(button);
+            button.onclick = async (e: Event) => {
+              const file = (e.target as HTMLInputElement).files?.[0];
+              if (file) {
+                const formData = new FormData();
+                formData.append(option?.["fileField"] || "file", file);
+                for (let key in option?.["data"]) {
+                  formData.append(key, option!["data"][key]);
+                }
+                const response = await fetchWithAuth(url, {
+                  method: 'POST',
+                  body: formData
+                });
                 button.remove();
-                resolve(res);
-              });
-            } else {
-              button.remove();
-              resolve({ data: { Error: "没有选择文件" } })
-            }
-          };
-        })
-      }
+                resolve({ data: await response.json() });
+              } else {
+                button.remove();
+                resolve({ data: { Error: "没有选择文件" } });
+              }
+            };
+          });
+        }
+      };
       // @ts-ignore
       this.axios = instance;
     }
@@ -609,7 +625,7 @@ export default function (
     // @ts-ignore
     window.single_cpzxrobot_instance = instance;
     instance.setAuth(args.devAuth, {
-      baseURL: args.baseURL,
+      baseURL: args.baseURL ?? "",
       verbose: args.verbose,
       disableFactorySelector: args.disableFactorySelector ?? false,
     });
@@ -622,5 +638,3 @@ export default function (
   }
   return instance;
 }
-
-export { type ElectricMeterRate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.2.58",
+  "version": "1.2.60",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {
@@ -12,9 +12,6 @@
   "devDependencies": {
     "typescript": "^5.5.3"
   },
-  "dependencies": {
-    "axios": "^1.7.2"
-  },
   "types": "types.d.ts",
   "typings": "types.d.ts"
 }

package/types.d.ts

@@ -18,6 +18,7 @@ import { RobotGateway } from "@cpzxrobot/sdk/robot_gateway";
 import { QuotationGateway } from "./quotation_gateway";
 import { AiGateway } from "./ai_gateway";
 import { EnergyGateway } from "./energy_gateway";
+import { type ElectricMeterRate } from "./energy_types/electric_meter_gateway";
 
 type Device = {
   id: number;
@@ -372,6 +373,8 @@ declare module "@cpzxrobot/sdk" {
       appCode: string;
       selectedFarm: Factory | null | undefined;
       selectedUnit: Unit | null | undefined;
+      verbose?: boolean;
+      disableFactorySelector?: boolean;
     } = {
         devAuth: "",
         appCode: "",
@@ -386,6 +389,8 @@ declare module "@cpzxrobot/sdk" {
           id: 0,
           name: "",
         },
+        verbose: false,
+        disableFactorySelector: false,
       }
   ): Cpzxrobot;
   export {
@@ -410,5 +415,6 @@ declare module "@cpzxrobot/sdk" {
     DeviceV2,
     FieldDatas,
     SensorDatas,
+    ElectricMeterRate
   };
 }