@cooperation/vc-storage 1.0.25 → 1.0.27

package/dist/models/GoogleDriveStorage.js

@@ -208,7 +208,7 @@ export class GoogleDriveStorage {
                 throw new Error('Folder ID is required to save a file.');
             }
             const fileMetadata = {
-                name: data.fileName || 'resume.json',
+                name: data.fileName || data.name + '.json' || data.credentialSubject.person.name.formattedName + '.json' || 'Untitled file.json',
                 parents: [folderId],
                 mimeType: data.mimeType || 'application/json',
             };
@@ -475,6 +475,61 @@ export class GoogleDriveStorage {
         await this.updateFileIdsJson(relationsFile.id);
         return relationsFile;
     }
+    async updateResumeRelation({ authorFolderId, draftFileId, signedFileId, }) {
+        try {
+            const relationFileName = 'relations.json';
+            // Step 1: Check if `relations.json` exists in RESUMES_AUTHOR/
+            const existingRelationFiles = await this.searchFiles(`name='${relationFileName}' and '${authorFolderId}' in parents`);
+            let relationFileId = null;
+            let existingRelations = {};
+            if (existingRelationFiles.length > 0) {
+                relationFileId = existingRelationFiles[0].id;
+                existingRelations = await this.getFileContent(relationFileId);
+            }
+            else {
+                console.log('relations.json does not exist. Will create a new one.');
+            }
+            // Step 2: Update relations object
+            existingRelations[draftFileId] = signedFileId;
+            // Step 3: Create or update the file on Drive
+            const fileBlob = new Blob([JSON.stringify(existingRelations, null, 2)], {
+                type: 'application/json',
+            });
+            const formData = new FormData();
+            const metadata = {
+                name: relationFileName,
+                parents: [authorFolderId],
+                mimeType: 'application/json',
+            };
+            formData.append('metadata', new Blob([JSON.stringify(metadata)], { type: 'application/json' }));
+            formData.append('file', fileBlob);
+            let uploadedFile;
+            if (relationFileId) {
+                // Update existing file
+                uploadedFile = await this.fetcher({
+                    method: 'PATCH',
+                    headers: {},
+                    body: formData,
+                    url: `https://www.googleapis.com/upload/drive/v3/files/${relationFileId}?uploadType=multipart&fields=id,parents`,
+                });
+            }
+            else {
+                // Create new file
+                uploadedFile = await this.fetcher({
+                    method: 'POST',
+                    headers: {},
+                    body: formData,
+                    url: `https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id,parents`,
+                });
+            }
+            console.log(`✅ Resume relation updated. File ID: ${uploadedFile.id}`);
+            return uploadedFile;
+        }
+        catch (error) {
+            console.error('❌ Failed to update resume relation:', error);
+            throw error;
+        }
+    }
     /**
      * Delete file by id
      * @param id

package/dist/models/Resume.js

@@ -5,21 +5,55 @@ export const resumeFolderTypes = {
 };
 export class StorageHandler {
     storage;
+    folderCreationPromises = {};
+    createdFolders = {};
     constructor(storage) {
         this.storage = storage;
     }
     async getOrCreateFolder(folderName, parentId) {
-        const folders = await this.storage.findFolders(parentId); // Fetch all child folders of the parent
-        let folder = folders.find((folder) => {
-            return folder.name === folderName;
-        });
-        if (!folder) {
-            folder = await this.storage.createFolder({
-                folderName,
-                parentFolderId: parentId,
-            });
+        const cacheKey = `${parentId}_${folderName}`;
+        // Check our local cache first (this is separate from the storage's cache)
+        if (this.createdFolders[cacheKey]) {
+            console.log(`Using cached folder ${folderName} (${this.createdFolders[cacheKey].id}) under ${parentId}`);
+            return this.createdFolders[cacheKey];
         }
-        return folder;
+        // If there's an existing promise for this folder, wait for it
+        if (this.folderCreationPromises[cacheKey]) {
+            console.log(`Waiting for existing folder creation: ${folderName} under ${parentId}`);
+            return this.folderCreationPromises[cacheKey];
+        }
+        // Create a new promise for this folder operation
+        this.folderCreationPromises[cacheKey] = (async () => {
+            try {
+                // Double-check if folder exists
+                console.log(`Searching for folder ${folderName} under ${parentId}`);
+                const folders = await this.storage.findFolders(parentId);
+                let folder = folders.find((f) => f.name === folderName);
+                if (folder) {
+                    console.log(`Found existing folder ${folderName} (${folder.id}) under ${parentId}`);
+                }
+                else {
+                    console.log(`Creating folder ${folderName} under ${parentId} (no existing folder found)`);
+                    folder = await this.storage.createFolder({
+                        folderName,
+                        parentFolderId: parentId,
+                    });
+                    console.log(`Created folder ${folderName} (${folder.id}) under ${parentId}`);
+                }
+                // Store in our local cache
+                this.createdFolders[cacheKey] = folder;
+                return folder;
+            }
+            catch (error) {
+                console.error(`Error in getOrCreateFolder(${folderName}, ${parentId}):`, error);
+                throw error;
+            }
+            finally {
+                // Clean up the promise after completion
+                delete this.folderCreationPromises[cacheKey];
+            }
+        })();
+        return this.folderCreationPromises[cacheKey];
     }
     async findFilesInFolder(folderName) {
         const folders = await this.storage.findFolders();
@@ -36,12 +70,8 @@ export class Resume extends StorageHandler {
     }
     async saveResume({ resume, type }) {
         try {
-            // Get or create the root folder
-            const rootFolders = await this.storage.findFolders();
-            let rootFolder = rootFolders.find((folder) => folder.name === resumeFolderTypes.root);
-            if (!rootFolder) {
-                rootFolder = await this.storage.createFolder({ folderName: resumeFolderTypes.root, parentFolderId: 'root' });
-            }
+            let rootFolder = await this.getOrCreateFolder(resumeFolderTypes.root, 'root');
+            console.log('🚀 ~ Resume ~ saveResume ~ rootFolder:', rootFolder);
             // Get or create the subfolder
             const subFolderName = type === 'sign' ? resumeFolderTypes.signed : resumeFolderTypes.nonSigned;
             const subFolder = await this.getOrCreateFolder(subFolderName, rootFolder.id);
@@ -72,7 +102,7 @@ export class Resume extends StorageHandler {
     async getSignedResumes() {
         try {
             // Find the root folder first
-            const rootFolder = await this.findRootFolder();
+            const rootFolder = await this.getOrCreateFolder(resumeFolderTypes.root, 'root');
             // Find or create the signed resumes folder
             const signedFolder = await this.getOrCreateFolder(resumeFolderTypes.signed, rootFolder.id);
             // Retrieve all files from the signed folder
@@ -86,7 +116,7 @@ export class Resume extends StorageHandler {
     async getNonSignedResumes() {
         try {
             // Find the root folder first
-            const rootFolder = await this.findRootFolder();
+            const rootFolder = await this.getOrCreateFolder(resumeFolderTypes.root, 'root');
             // Find or create the non-signed resumes folder
             const nonSignedFolder = await this.getOrCreateFolder(resumeFolderTypes.nonSigned, rootFolder.id);
             // Retrieve all files from the non-signed folder
@@ -97,13 +127,28 @@ export class Resume extends StorageHandler {
             throw new Error('Error while fetching non-signed resumes: ' + error.message);
         }
     }
-    async findRootFolder() {
-        const rootFolders = await this.storage.findFolders(); // Fetch all root-level folders
-        const rootFolder = rootFolders.find((folder) => folder.name === resumeFolderTypes.root);
-        if (!rootFolder) {
-            throw new Error(`Root folder "${resumeFolderTypes.root}" not found in the root directory.`);
+    async saveResumeDraft(data, signedResumeId) {
+        try {
+            const fileName = `FinalDraft_${signedResumeId}.json`;
+            // 1. Find or create root and NON_SIGNED_RESUMES folder
+            const rootFolder = await this.getOrCreateFolder(resumeFolderTypes.root, 'root');
+            const nonSignedFolder = await this.getOrCreateFolder(resumeFolderTypes.nonSigned, rootFolder.id);
+            const dataWithFileName = {
+                ...data,
+                fileName: `FinalDraft_${signedResumeId}.json`,
+            };
+            // Save the file
+            const savedDraft = await this.storage.saveFile({
+                data: dataWithFileName,
+                folderId: nonSignedFolder.id,
+            });
+            console.log(`✅ Draft saved as ${fileName}`);
+            return savedDraft;
+        }
+        catch (error) {
+            console.error('❌ Error saving resume draft:', error);
+            throw new Error('Failed to save resume draft: ' + error.message);
         }
-        return rootFolder;
     }
     isResumeFolderExist() { }
 }

package/dist/models/ResumeVC.js

@@ -18,8 +18,7 @@ export class ResumeVC {
                 suite,
                 documentLoader: customDocumentLoader,
             });
-            console.log('🚀 ~ ResumeVC ~ sign ~ signedVC:', JSON.stringify(signedVC));
-            console.log('Signed VC:', JSON.stringify(signedVC));
+            console.log('Signed VC:', signedVC);
         }
         catch (error) {
             console.error('Error signing VC:', error.message);
@@ -73,6 +72,7 @@ export class ResumeVC {
                     },
                     title: exp.title || '',
                     description: exp.description || '',
+                    duration: exp.duration || '',
                     startDate: exp.startDate || '',
                     endDate: exp.endDate || '',
                     stillEmployed: exp.stillEmployed || false,
@@ -85,6 +85,7 @@ export class ResumeVC {
                     institution: edu.institution || '',
                     degree: edu.degree || '',
                     fieldOfStudy: edu.fieldOfStudy || '',
+                    duration: edu.duration || '',
                     startDate: edu.startDate || '',
                     endDate: edu.endDate || '',
                     verificationStatus: edu.verificationStatus || 'unverified',
@@ -113,6 +114,7 @@ export class ResumeVC {
                     name: proj.name || '',
                     description: proj.description || '',
                     url: proj.url || '',
+                    duration: proj.duration || '',
                     startDate: proj.startDate || '',
                     endDate: proj.endDate || '',
                     verificationStatus: proj.verificationStatus || 'unverified',

package/dist/types/models/GoogleDriveStorage.d.ts

@@ -76,6 +76,11 @@ export declare class GoogleDriveStorage {
     createRelationsFile({ vcFolderId }: {
         vcFolderId: string;
     }): Promise<any>;
+    updateResumeRelation({ authorFolderId, draftFileId, signedFileId, }: {
+        authorFolderId: string;
+        draftFileId: string;
+        signedFileId: string;
+    }): Promise<any>;
     /**
      * Delete file by id
      * @param id

package/dist/types/models/Resume.d.ts

@@ -6,6 +6,8 @@ export declare const resumeFolderTypes: {
 };
 export declare class StorageHandler {
     protected storage: GoogleDriveStorage;
+    private folderCreationPromises;
+    private createdFolders;
     constructor(storage: GoogleDriveStorage);
     getOrCreateFolder(folderName: string, parentId: string): Promise<any>;
     protected findFilesInFolder(folderName: string): Promise<any[]>;
@@ -22,7 +24,7 @@ export declare class Resume extends StorageHandler {
     }>;
     getSignedResumes(): Promise<any[]>;
     getNonSignedResumes(): Promise<any[]>;
-    private findRootFolder;
+    saveResumeDraft(data: any, signedResumeId: string): Promise<any>;
     private isResumeFolderExist;
 }
 export default Resume;

package/dist/types/utils/context.d.ts

@@ -102,7 +102,7 @@ export declare const inlineResumeContext: {
         Resume: string;
     };
 };
-declare let localOBContext: {
+declare const localOBContext: {
     '@context': {
         '@protected': boolean;
         id: string;
@@ -546,7 +546,7 @@ declare let localOBContext: {
         };
     };
 };
-declare let localED25519Context: {
+declare const localED25519Context: {
     '@context': {
         id: string;
         type: string;

package/dist/utils/context.js

@@ -118,7 +118,7 @@ export const inlineResumeContext = {
         Resume: 'https://schema.hropenstandards.org/4.4#Resume',
     },
 };
-let localOBContext = {
+const localOBContext = {
     '@context': {
         '@protected': true,
         id: '@id',
@@ -562,7 +562,7 @@ let localOBContext = {
         },
     },
 };
-let localED25519Context = {
+const localED25519Context = {
     '@context': {
         id: '@id',
         type: '@type',

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cooperation/vc-storage",
 	"type": "module",
-	"version": "1.0.25",
+	"version": "1.0.27",
 	"description": "Sign and store your verifiable credentials.",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
@@ -33,7 +33,7 @@
 		"@types/jest": "^29.5.14",
 		"@types/uuid": "^10.0.0",
 		"babel-jest": "^29.7.0",
-		"typescript": "^5.6.2",
+		"typescript": "^5.8.2",
 		"vitest": "^3.0.5"
 	}
 }