@fett/synology-api 0.0.3-beta.4 → 0.0.3-beta.6

package/lib/core.js

@@ -106,13 +106,12 @@ export class SynologyApi extends BaseModuleSynologyApi {
         // https agent for node
         if (isNode) {
             if (this.agent?.https) {
-                const hspa = await import("https-proxy-agent");
-                requestOptions.httpsAgent = new hspa.HttpsProxyAgent(`https://${this.agent.https.host}:${this.agent.https.port}`);
+                const { HttpsProxyAgent } = require("https-proxy-agent");
+                requestOptions.httpsAgent = new HttpsProxyAgent(`https://${this.agent.https.host}:${this.agent.https.port}`);
             }
             // http agent
             if (this.agent?.http) {
-                const hpa = await import("http-proxy-agent");
-                const HttpProxyAgent = hpa.HttpProxyAgent;
+                const { HttpProxyAgent } = require("http-proxy-agent");
                 requestOptions.httpAgent = new HttpProxyAgent(`http://${this.agent.http.host}:${this.agent.http.port}`);
             }
         }

package/lib/modules/FileStation/Upload.d.ts

@@ -1 +1,21 @@
-export declare function uploadFile(...args: any[]): Promise<import("./Upload.base.js").UploadFileResponse>;
+import { AxiosProgressEvent } from "axios";
+import { SynologyApiResponse } from "../../types/index.js";
+declare enum OverwriteEnum {
+    OVERWRITE = "overwrite",
+    SKIP = "skip"
+}
+export type UploadFileParams = {
+    path: string;
+    file: File | Blob | string | any;
+    overwrite?: OverwriteEnum;
+    create_parents?: boolean;
+    onUploadProgress?: (progress: AxiosProgressEvent) => void;
+};
+export type UploadFileResponse = SynologyApiResponse<{
+    blSkip: boolean;
+    file: string;
+    pid: number;
+    progress: number;
+}>;
+export declare function uploadFile(params: UploadFileParams): Promise<any>;
+export {};

package/lib/modules/FileStation/Upload.js

@@ -1,28 +1,44 @@
 import { isNode } from "../../utils/index.js";
-import { uploadFileBase } from "./Upload.base.js";
-export async function uploadFile(...args) {
+import { createFormData, getFormDataHeaders } from "../../utils/index.js";
+import { FileStationApi } from "../../types/index.js";
+var OverwriteEnum;
+(function (OverwriteEnum) {
+    OverwriteEnum["OVERWRITE"] = "overwrite";
+    OverwriteEnum["SKIP"] = "skip";
+})(OverwriteEnum || (OverwriteEnum = {}));
+export async function uploadFile(params) {
     if (!this.isConnecting) {
         await this.connect();
     }
-    // @ts-ignore
-    return uploadFileBase(...args, async (file, formdata) => {
-        // nodejs environment
-        if (isNode) {
-            let fileContent;
-            let fileName = "";
-            if (typeof file === "string") {
-                fileName = await import("path").then((p) => p.basename(file));
-                fileContent = await import("node:fs/promises").then((fs) => fs.readFile(file));
-            }
-            formdata.append("file", fileContent, {
-                filename: fileName,
-                contentType: "application/octet-stream", // 可根据文件类型修改
-            });
+    const api = this.getApiInfoByName(FileStationApi.Upload);
+    const { path, file, overwrite = OverwriteEnum.OVERWRITE, create_parents = true } = params;
+    let formData = createFormData();
+    formData.append("method", "upload");
+    formData.append("version", String(api?.maxVersion));
+    formData.append("api", FileStationApi.Upload);
+    formData.append("path", path);
+    formData.append("overwrite", overwrite);
+    formData.append("create_parents", String(create_parents));
+    if (isNode) {
+        let fileContent;
+        let fileName = "";
+        if (typeof file === "string") {
+            fileName = require("path").basename(file);
+            fileContent = await require("path").readFile(file);
         }
-        else {
-            // for browser environment
-            formdata.append("file", file);
-        }
-        return formdata;
+        formData.append("file", fileContent, {
+            filename: fileName,
+            contentType: "application/octet-stream", // 可根据文件类型修改
+        });
+    }
+    else {
+        // for browser environment
+        formData.append("file", file);
+    }
+    const res = this.run(FileStationApi.Upload, {
+        method: "post",
+        data: formData,
+        headers: getFormDataHeaders(formData),
     });
+    return res;
 }

package/lib/modules/FileStation/Upload.rn.d.ts

@@ -1 +1,21 @@
-export declare function uploadFile(...args: any[]): Promise<void>;
+import { AxiosProgressEvent } from "axios";
+import { SynologyApiResponse } from "../../types/index.js";
+declare enum OverwriteEnum {
+    OVERWRITE = "overwrite",
+    SKIP = "skip"
+}
+export type UploadFileParams = {
+    path: string;
+    file: File | Blob | string | any;
+    overwrite?: OverwriteEnum;
+    create_parents?: boolean;
+    onUploadProgress?: (progress: AxiosProgressEvent) => void;
+};
+export type UploadFileResponse = SynologyApiResponse<{
+    blSkip: boolean;
+    file: string;
+    pid: number;
+    progress: number;
+}>;
+export declare function uploadFile(params: UploadFileParams): Promise<any>;
+export {};

package/lib/modules/FileStation/Upload.rn.js

@@ -1,11 +1,30 @@
-import { uploadFileBase } from "./Upload.base.js";
-export async function uploadFile(...args) {
+import { createFormData } from "../../utils/index.js";
+import { FileStationApi } from "../../types/index.js";
+var OverwriteEnum;
+(function (OverwriteEnum) {
+    OverwriteEnum["OVERWRITE"] = "overwrite";
+    OverwriteEnum["SKIP"] = "skip";
+})(OverwriteEnum || (OverwriteEnum = {}));
+export async function uploadFile(params) {
     if (!this.isConnecting) {
         await this.connect();
     }
-    // @ts-ignore
-    uploadFileBase(...args, async (file, formdata) => {
-        formdata.append("file", file);
-        return formdata;
+    const api = this.getApiInfoByName(FileStationApi.Upload);
+    const { path, file, overwrite = OverwriteEnum.OVERWRITE, create_parents = true } = params;
+    let formData = createFormData();
+    formData.append("method", "upload");
+    formData.append("version", String(api?.maxVersion));
+    formData.append("api", FileStationApi.Upload);
+    formData.append("path", path);
+    formData.append("overwrite", overwrite);
+    formData.append("create_parents", String(create_parents));
+    formData.append("file", file);
+    const res = this.run(FileStationApi.Upload, {
+        method: "post",
+        data: formData,
+        headers: {
+            "Content-Type": "multipart/form-data",
+        },
     });
+    return res;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fett/synology-api",
-  "version": "0.0.3-beta.4",
+  "version": "0.0.3-beta.6",
   "description": "synology api for nodejs",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/lib/modules/FileStation/Upload.base.d.ts

@@ -1,21 +0,0 @@
-import { AxiosProgressEvent } from "axios";
-import { SynologyApiResponse } from "../../types/index.js";
-declare enum OverwriteEnum {
-    OVERWRITE = "overwrite",
-    SKIP = "skip"
-}
-export type UploadFileParams = {
-    path: string;
-    file: File | Blob | string | any;
-    overwrite?: OverwriteEnum;
-    create_parents?: boolean;
-    onUploadProgress?: (progress: AxiosProgressEvent) => void;
-};
-export type UploadFileResponse = SynologyApiResponse<{
-    blSkip: boolean;
-    file: string;
-    pid: number;
-    progress: number;
-}>;
-export declare function uploadFileBase(params: UploadFileParams, parseFileFn: (file: File | Blob | string, formdata: any) => any): Promise<UploadFileResponse>;
-export {};

package/lib/modules/FileStation/Upload.base.js

@@ -1,25 +0,0 @@
-import { createFormData, getFormDataHeaders } from "../../utils/index.js";
-import { FileStationApi } from "../../types/index.js";
-var OverwriteEnum;
-(function (OverwriteEnum) {
-    OverwriteEnum["OVERWRITE"] = "overwrite";
-    OverwriteEnum["SKIP"] = "skip";
-})(OverwriteEnum || (OverwriteEnum = {}));
-export async function uploadFileBase(params, parseFileFn) {
-    const { path, file, overwrite = OverwriteEnum.OVERWRITE, create_parents = true } = params;
-    const api = this.getApiInfoByName(FileStationApi.Upload);
-    let formData = createFormData();
-    formData.append("method", "upload");
-    formData.append("version", String(api?.maxVersion));
-    formData.append("api", FileStationApi.Upload);
-    formData.append("path", path);
-    formData.append("overwrite", overwrite);
-    formData.append("create_parents", String(create_parents));
-    formData = parseFileFn(file, formData);
-    const res = this.run(FileStationApi.Upload, {
-        method: "post",
-        data: formData,
-        headers: getFormDataHeaders(formData),
-    });
-    return res;
-}