datasync-blob 1.1.35 → 1.1.37

package/dist/components/DsBlob.d.ts

@@ -31,6 +31,7 @@ export interface DsBlobProps {
     /** Upload image to Datasync cloud storage instead of encoding as base64 */
     cloud_storage?: boolean;
     cloud_url_prefix?: string;
+    datasync_url?: string;
     /** Label shown on the upload button */
     Caption?: string;
     /** CSS class applied to the upload button */

package/dist/components/DsBlob.js

@@ -47,7 +47,7 @@ const react_1 = __importStar(require("react"));
 const datasync_core_1 = require("datasync-core");
 //-----------------------------------------------------------------------------------------------------------------------------------------
 function DsBlob(props) {
-    const { item_id, data: dataProp = "", binaryData: binaryDataProp = null, uploadPicture, width, height, maxWidth, maxHeight, maxKBytes, reduceImage, jpegQuality, cloud_storage, cloud_url_prefix, Caption, buttonStyle, pictureStyle, readOnly, onErrorHandler, debugging = false, } = props;
+    const { item_id, data: dataProp = "", binaryData: binaryDataProp = null, uploadPicture, width, height, maxWidth, maxHeight, maxKBytes, reduceImage, jpegQuality, cloud_storage, cloud_url_prefix, datasync_url = "http://localhost:8888/datasync-service", Caption, buttonStyle, pictureStyle, readOnly, onErrorHandler, debugging = false, } = props;
     const [hoverInput, setHoverInput] = (0, react_1.useState)(false);
     const [hoverImage, setHoverImage] = (0, react_1.useState)(false);
     const [data, setDataState] = (0, react_1.useState)(dataProp || "");
@@ -112,6 +112,20 @@ function DsBlob(props) {
         });
     };
     //-----------------------------------------
+    const getCloudFilename = (p_cloud_prefix) => {
+        let ls_cloud_file_name = p_cloud_prefix.split('/').pop() || "";
+        if (debugging)
+            console.log(`getCloudFilename::ls_cloud_file_name -> ${ls_cloud_file_name}`);
+        return (ls_cloud_file_name);
+    };
+    //-----------------------------------------
+    const getCloudPath = (p_datasync_url) => {
+        let ls_cloud_path = (p_datasync_url || "").replace(/\/+$/, "");
+        if (debugging)
+            console.log(`getCloudPath::ls_cloud_path -> ${ls_cloud_path}`);
+        return (ls_cloud_path);
+    };
+    //-----------------------------------------
     /**
      * Upload binary data to Datasync Cloud server using the SyncPushCloud endpoint.
      * Returns true on success, throws on failure.
@@ -119,7 +133,7 @@ function DsBlob(props) {
     const uploadToDatasyncCloud = (pictureBlob) => __awaiter(this, void 0, void 0, function* () {
         try {
             const formData = new FormData();
-            const cloud_filename = pictureBlob.cloud_url_prefix.split('/').pop() || "";
+            const cloud_filename = getCloudFilename(pictureBlob.cloud_url_prefix);
             console.log("Uploading to Datasync Cloud with filename:", cloud_filename);
             formData.append('action', "syncPushCloud");
             formData.append('filename', cloud_filename);
@@ -164,7 +178,7 @@ function DsBlob(props) {
             formData.append('binary', binaryString);
             if (debugging)
                 console.log("binaryString ->", binaryString.substring(0, 100) + '...');
-            const results = yield fetch('http://localhost:8888/datasync-service/Sync.php', {
+            const results = yield fetch(`${getCloudPath(datasync_url)}/Sync.php`, {
                 method: 'POST',
                 body: formData,
             });
@@ -219,11 +233,11 @@ function DsBlob(props) {
     const deleteFromDatasyncCloud = (pictureBlob) => __awaiter(this, void 0, void 0, function* () {
         try {
             const formData = new FormData();
-            const cloud_filename = pictureBlob.cloud_url_prefix.split('/').pop() || "";
+            const cloud_filename = getCloudFilename(cloud_url_prefix || "");
             console.log("Deleting from Datasync Cloud with filename:", cloud_filename);
             formData.append('action', "syncDeleteCloud");
             formData.append('filename', cloud_filename);
-            const results = yield fetch('http://localhost:8888/datasync-service/Sync.php', {
+            const results = yield fetch(`${getCloudPath(datasync_url)}/Sync.php`, {
                 method: 'POST',
                 body: formData,
             });
@@ -404,15 +418,21 @@ function DsBlob(props) {
     };
     //-----------------------------------------------------------------------------------------------------------------------------------------
     const getImageSrc = () => {
+        if (debugging)
+            console.log(`getImageSrc:::data->${data}`);
         if (!data)
             return "";
         if (data.startsWith('http://') || data.startsWith('https://') || data.startsWith('blob:')) {
-            return data;
+            if (debugging)
+                console.log(`getImageSrc:::data starts with httpx://`);
+            return `${data}?${(0, datasync_core_1.CGUID)()}`; //CacheBreaker trial;
         }
         if (data.startsWith('data:')) {
+            if (debugging)
+                console.log(`getImageSrc:::data starts with data:`);
             return data;
         }
-        return data;
+        return `${data}?${(0, datasync_core_1.CGUID)()}`; //CacheBreaker trial
     };
     //-----------------------------------------------------------------------------------------------------------------------------------------
     const upload_picture_label = { cursor: "pointer" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datasync-blob",
-  "version": "1.1.35",
+  "version": "1.1.37",
   "description": "Datasync Blob component",
   "main": "./dist/components/DsBlob.js",
   "files": [