Merge pull request #90 from aspose-pdf-cloud/develop

update to 24.3

Author: kaferi

README.md

@@ -30,8 +30,7 @@ XLS, XLSX, PPTX, DOC, DOCX, MobiXML, JPEG, EMF, PNG, BMP, GIF, TIFF, Text
 ## Read PDF Formats
 MHT, PCL, PS, XSLFO, MD
 
-## Enhancements in Version 24.2
-- Memory leak when converting PDF to DOCX.
+## Enhancements in Version 24.3
 - A new version of Aspose.PDF Cloud was prepared using the latest version of Aspose.PDF for .NET.
 
 ## Installation
@@ -44,7 +43,6 @@ From the command line:
 $ npm install asposepdfcloud --save
 ```
 ## Get PDF Page Annotations in Node.Js
-
 ```js
 	// Get your ClientId and ClientSecret from https://dashboard.aspose.cloud (free registration required).
 	const pdfApi = new PdfApi("MY_CLIENT_ID", "MY_CLIENT_SECRET");
@@ -60,6 +58,11 @@ $ npm install asposepdfcloud --save
 	});
 ```
 
+## SelfHost Aspose.PDF Cloud
+Create *PdfApi* object with one **baseUrl** parameter:
+```js
+	const pdfApi = new PdfApi("MY_SELFHOST_URL");
+```
 
 ## Unit Tests
 Aspose PDF SDK includes a suite of unit tests within the "test" subdirectory. These Unit Tests also serves as examples of how to use the Aspose PDF SDK.

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "asposepdfcloud",
-    "version": "24.2.0",
+    "version": "24.3.0",
     "description": "Aspose.PDF Cloud is a REST API for creating and editing PDF files. Most popular features proposed by Aspose.PDF Cloud: PDF to Word, Convert PDF to Image, Merge PDF, Split PDF, Add Images to PDF, Rotate PDF. It can also be used to convert PDF files to different formats like DOC, HTML, XPS, TIFF and many more. Aspose.PDF Cloud gives you control: create PDFs from scratch or from HTML, XML, template, database, XPS or an image. Render PDFs to image formats such as JPEG, PNG, GIF, BMP, TIFF and many others. Aspose.PDF Cloud helps you manipulate elements of a PDF file like text, annotations, watermarks, signatures, bookmarks, stamps and so on. Its REST API also allows you to manage PDF pages by using features like merging, splitting, and inserting. Add images to a PDF file or convert PDF pages to images.",
     "homepage": "https://products.aspose.cloud/pdf/cloud",
     "author": {

package.json

@@ -327,17 +327,23 @@ export class PdfApi {
      */
     public configuration: Configuration;
 
+    /**
+     * @param baseUrl SelfHost Base api Url.
+     */
+    constructor(baseUrl: string);
+
     /**
      * @param appSID App SID.
      * @param appKey App key.
-     * @param baseUrl Base api Url.
      */
-    constructor(appSID: string, appKey: string, baseUrl?: string) {
-        if (baseUrl === null || baseUrl === undefined)
-        {
-            baseUrl = defaultBasePath;   
-        }
-        this.configuration = new Configuration(appSID, appKey, baseUrl);
+    constructor(appSID: string, appKey: string);
+
+    constructor(...arr: string[]){
+        if (arr.length === 1) {
+            this.configuration = new Configuration(true, "", "", arr[0]);
+        } else if (arr.length === 2) {
+            this.configuration = new Configuration(false, arr[0], arr[1], defaultBasePath);
+        } 
     }
 
     set useQuerystring(value: boolean) {

src/api/api.ts

@@ -1,6 +1,6 @@
  /**
  *
- * Copyright (c) 2023 Aspose.PDF Cloud
+ * Copyright (c) 2024 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights

src/auth.ts

@@ -1,6 +1,6 @@
  /**
  *
- * Copyright (c) 2023 Aspose.PDF Cloud
+ * Copyright (c) 2024 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -25,6 +25,11 @@ import { IAuthentication, OAuth  } from "./auth";
  * Pdf API configuration
  */
 export class Configuration {
+    /**
+     * SelfHost.
+     */
+    public selfHost: boolean;
+
     /**
      * Authentication.
      */
@@ -50,15 +55,14 @@ export class Configuration {
      */
     public debugMode: boolean;
 
-    constructor(appSID: string, appKey: string, baseUrl?: string, debugMode?: boolean) {
+    constructor(selfHost: boolean, appSID: string, appKey: string, baseUrl?: string, debugMode?: boolean) {
         if (baseUrl) {
             this.baseUrl = baseUrl;
         }
-
+        this.selfHost = selfHost;
         this.appSID = appSID;
         this.appKey = appKey;
         this.debugMode = debugMode;
-
         this.authentication = new OAuth() as IAuthentication;
     }
 

src/configuration.ts

@@ -1,6 +1,6 @@
  /**
  *
- * Copyright (c) 2023 Aspose.PDF Cloud
+ * Copyright (c) 2024 Aspose.PDF Cloud
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -72,9 +72,11 @@ async function invokeApiMethodInternal(requestOptions: request.Options, confgura
     let sa = superagent(requestOptions.method, requestOptions["uri"]);
 
     const auth = confguration.authentication;
-    if (!notApplyAuthToRequest) {
-        await auth.applyToRequest(requestOptions, confguration);
-    } 
+    if (!confguration.selfHost) {
+        if (!notApplyAuthToRequest) {
+            await auth.applyToRequest(requestOptions, confguration);
+        } 
+    }
 
     if (requestOptions.form) {
         sa.type('form');
@@ -93,14 +95,16 @@ async function invokeApiMethodInternal(requestOptions: request.Options, confgura
     //headers
     sa.set("User-Agent", "pdf nodejs sdk");
     sa.set("x-aspose-client", "nodejs sdk");  
-    sa.set("x-aspose-client-version", "24.2.0");
+    sa.set("x-aspose-client-version", "24.3.0");
 
     if (!requestOptions.headers) {
         requestOptions.headers = {};
     } 
 
-    if (!notApplyAuthToRequest) {
-        sa.set("Authorization", requestOptions.headers.Authorization);
+    if (!confguration.selfHost) {
+        if (!notApplyAuthToRequest) {
+            sa.set("Authorization", requestOptions.headers.Authorization);
+        }
     }
 
     if (requestOptions.json){

src/requestHelper.ts

@@ -38,7 +38,14 @@ export function getPdfApi() {
   if (!pdfApi) {
     let servercreds_json = fs.readFileSync('../../Settings/servercreds.json', 'utf8')
     let creds = JSON.parse(servercreds_json)
-    pdfApi = new PdfApi(creds.AppSID, creds.AppKey, creds.ProductUri);
+    if (!creds.SelfHost) {
+      creds.SelfHost = false
+    }
+    if (creds.SelfHost){
+      pdfApi = new PdfApi(creds.ProductUri);
+    } else {
+      pdfApi = new PdfApi(creds.AppSID, creds.AppKey);
+    }
     pdfApi.configuration.debugMode = true;
   }
   return pdfApi;