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

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.base.d.ts

@@ -17,5 +17,5 @@ export type UploadFileResponse = SynologyApiResponse<{
     pid: number;
     progress: number;
 }>;
-export declare function uploadFileBase(params: UploadFileParams, parseFileFn: (file: File | Blob | string, formdata: any) => any): Promise<UploadFileResponse>;
+export declare function uploadFileBase(_that: any, params: UploadFileParams, parseFileFn: (file: File | Blob | string, formdata: any) => Promise<any>): Promise<UploadFileResponse>;
 export {};

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

@@ -5,9 +5,9 @@ var OverwriteEnum;
     OverwriteEnum["OVERWRITE"] = "overwrite";
     OverwriteEnum["SKIP"] = "skip";
 })(OverwriteEnum || (OverwriteEnum = {}));
-export async function uploadFileBase(params, parseFileFn) {
+export async function uploadFileBase(_that, params, parseFileFn) {
     const { path, file, overwrite = OverwriteEnum.OVERWRITE, create_parents = true } = params;
-    const api = this.getApiInfoByName(FileStationApi.Upload);
+    const api = _that.getApiInfoByName(FileStationApi.Upload);
     let formData = createFormData();
     formData.append("method", "upload");
     formData.append("version", String(api?.maxVersion));
@@ -15,8 +15,8 @@ export async function uploadFileBase(params, parseFileFn) {
     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, {
+    formData = await parseFileFn(file, formData);
+    const res = _that.run(FileStationApi.Upload, {
         method: "post",
         data: formData,
         headers: getFormDataHeaders(formData),

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

@@ -1 +1 @@
-export declare function uploadFile(...args: any[]): Promise<import("./Upload.base.js").UploadFileResponse>;
+export declare function uploadFile(args: any): Promise<import("./Upload.base.js").UploadFileResponse>;

package/lib/modules/FileStation/Upload.js

@@ -1,18 +1,18 @@
 import { isNode } from "../../utils/index.js";
 import { uploadFileBase } from "./Upload.base.js";
-export async function uploadFile(...args) {
+export async function uploadFile(args) {
     if (!this.isConnecting) {
         await this.connect();
     }
     // @ts-ignore
-    return uploadFileBase(...args, async (file, formdata) => {
+    return uploadFileBase(this, 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));
+                fileName = require("path").basename(file);
+                fileContent = await require("path").readFile(file);
             }
             formdata.append("file", fileContent, {
                 filename: fileName,

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

@@ -1 +1 @@
-export declare function uploadFile(...args: any[]): Promise<void>;
+export declare function uploadFile(args: any): Promise<import("./Upload.base.js").UploadFileResponse>;

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

@@ -1,10 +1,10 @@
 import { uploadFileBase } from "./Upload.base.js";
-export async function uploadFile(...args) {
+export async function uploadFile(args) {
     if (!this.isConnecting) {
         await this.connect();
     }
     // @ts-ignore
-    uploadFileBase(...args, async (file, formdata) => {
+    return uploadFileBase(this, args, async (file, formdata) => {
         formdata.append("file", file);
         return formdata;
     });

package/package.json

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