(simatec) Onedrive list with new API Request

Author: simatec

admin/custom/customComponents.js

@@ -6,6 +6,7 @@ const got = require('@esm2cjs/got').default;
 
 let od_accessToken;
 
+/*
 async function list(restoreSource, options, types, log, callback) {
     const db_onedriveAccessJson = options.onedriveAccessJson !== undefined ? options.onedriveAccessJson : options.onedrive && options.onedrive.onedriveAccessJson !== undefined ? options.onedrive.onedriveAccessJson : '';
     const db_dir = options.dir !== undefined ? options.dir : options.onedrive && options.onedrive.dir !== undefined ? options.onedrive.dir : '/';
@@ -85,6 +86,63 @@ async function list(restoreSource, options, types, log, callback) {
         setImmediate(callback);
     }
 }
+*/
+
+async function list(restoreSource, options, types, log, callback) {
+    const db_onedriveAccessJson = options.onedriveAccessJson !== undefined ? options.onedriveAccessJson : options.onedrive && options.onedrive.onedriveAccessJson !== undefined ? options.onedrive.onedriveAccessJson : '';
+    const db_dir = options.dir !== undefined ? options.dir : options.onedrive && options.onedrive.dir !== undefined ? options.onedrive.dir : '/';
+    const db_ownDir = options.ownDir !== undefined ? options.ownDir : options.onedrive && options.onedrive.ownDir !== undefined ? options.onedrive.ownDir : false;
+    const db_dirMinimal = options.dirMinimal !== undefined ? options.dirMinimal : options.onedrive && options.onedrive.dirMinimal !== undefined ? options.onedrive.dirMinimal : '/';
+
+    let od_accessToken;
+
+    // Refresh token if necessary
+    if (!restoreSource || restoreSource === 'onedrive') {
+        const onedrive = new Onedrive();
+        try {
+            od_accessToken = await onedrive.getToken(db_onedriveAccessJson, log);
+        } catch (err) {
+            log.warn(`Onedrive Token: ${err}`);
+        }
+
+        if (od_accessToken) {
+            let dir = (db_dir || '').replace(/\\/g, '/');
+
+            // Use minimal path if ownDir is true
+            if (db_ownDir === true) {
+                dir = (db_dirMinimal || '').replace(/\\/g, '/');
+            }
+
+            // Normalize directory format
+            if (!dir || dir[0] !== '/') {
+                dir = `/${dir || ''}`;
+            }
+
+            if (!dir) {
+                dir = 'root';
+            }
+
+            if (dir.startsWith('/')) {
+                dir = dir.substring(1);
+            }
+
+            try {
+                // Call internal listBackups method from class
+                const files = await onedrive.listBackups({ accessToken: od_accessToken, dir, types, log });
+
+                callback && callback(null, files, 'onedrive');
+            } catch (error) {
+                log.error(`Onedrive listBackups error: ${error}`);
+                callback && callback(error);
+            }
+
+        } else {
+            callback && callback('No access token available');
+        }
+    } else {
+        callback && callback();
+    }
+}
 
 async function getFile(options, fileName, toStoreName, log, callback) {
     const db_onedriveAccessJson = options.onedriveAccessJson !== undefined ? options.onedriveAccessJson : options.onedrive?.onedriveAccessJson || '';

lib/list/onedrive.js

@@ -203,29 +203,6 @@ class onedrive {
         throw new Error('Upload did not complete properly');
     }
 
-    async getMetadata({ accessToken, itemPath }) {
-        const targetPath = itemPath === 'root' ? 'root' : `root:/${itemPath}`;
-        const url = `https://graph.microsoft.com/v1.0/me/drive/${targetPath}`;
-
-        const response = await got.get(url, {
-            headers: { Authorization: `Bearer ${accessToken}` },
-            responseType: 'json'
-        });
-
-        return response.body;
-    }
-
-    async listChildren({ accessToken, itemId }) {
-        const url = `https://graph.microsoft.com/v1.0/me/drive/items/${itemId}/children`;
-
-        const response = await got.get(url, {
-            headers: { Authorization: `Bearer ${accessToken}` },
-            responseType: 'json'
-        });
-
-        return response.body;
-    }
-
     async downloadFile({ accessToken, dir, onlyFileName, downloadPath, log }) {
         try {
             const meta = await this.getMetadata({ accessToken, itemPath: dir });
@@ -305,6 +282,79 @@ class onedrive {
 
         return response;
     }
+
+    async getMetadata({ accessToken, itemPath }) {
+        const targetPath = itemPath === 'root' ? 'root' : `root:/${itemPath}`;
+        const url = `https://graph.microsoft.com/v1.0/me/drive/${targetPath}`;
+
+        const response = await got.get(url, {
+            headers: { Authorization: `Bearer ${accessToken}` },
+            responseType: 'json'
+        });
+
+        return response.body;
+    }
+
+    async listChildren({ accessToken, itemId }) {
+        const url = `https://graph.microsoft.com/v1.0/me/drive/items/${itemId}/children`;
+
+        const response = await got.get(url, {
+            headers: { Authorization: `Bearer ${accessToken}` },
+            responseType: 'json'
+        });
+
+        return response.body;
+    }
+
+    async listBackups({ accessToken, dir, types, log }) {
+        try {
+            // Normalize path
+            let normalizedDir = (dir || '').replace(/\\/g, '/');
+            if (!normalizedDir || normalizedDir === '/') {
+                normalizedDir = 'root';
+            } else {
+                if (normalizedDir.startsWith('/')) {
+                    normalizedDir = normalizedDir.slice(1);
+                }
+            }
+
+            const metadata = await this.getMetadata({ accessToken, itemPath: normalizedDir });
+            if (!metadata?.id) {
+                throw new Error('Could not retrieve metadata');
+            }
+
+            const childrenRes = await this.listChildren({ accessToken, itemId: metadata.id });
+            let children = childrenRes?.value;
+            if (!children) return null;
+
+            // Filter and transform children
+            children = children
+                .map(file => ({
+                    path: file.name,
+                    name: file.name,
+                    size: file.size,
+                    id: file.id
+                }))
+                .filter(file =>
+                    (types.includes(file.name.split('_')[0]) || types.includes(file.name.split('.')[0])) &&
+                    file.name.endsWith('.gz')
+                );
+
+            // Group by type
+            const files = {};
+            for (const file of children) {
+                const type = file.name.split('_')[0];
+                if (!files[type]) files[type] = [];
+                files[type].push(file);
+            }
+
+            return files;
+
+        } catch (error) {
+            log.error(`listBackups error: ${error.message}`);
+            throw error;
+        }
+    }
 }
 
 module.exports = onedrive;