spd-lib 1.0.9 → 1.1.1

package/index.js

@@ -44,10 +44,7 @@ this.salt = salt;
             throw new Error('Invalid output path or salt.');
         }
 
-        const keyPair = {
-            publicKey: Array.from(this.keyPair.publicKey)
-        };
-        const spdData = JSON.stringify({ keyPair, data: this.data, salt: Array.from(this.salt) });
+        const spdData = JSON.stringify({ data: this.data, salt: Array.from(this.salt) });
         const compressedSpdData = zlib.deflateSync(spdData);
         fs.writeFileSync(outputPath, compressedSpdData, { mode: 0o600 });
     }
@@ -61,14 +58,14 @@ this.salt = salt;
         await sodium.ready;
         const compressedSpdData = fs.readFileSync(spdPath);
         const spdData = zlib.inflateSync(compressedSpdData).toString('utf8');
-        const { keyPair, data, salt } = JSON.parse(spdData);
+        const { data, salt } = JSON.parse(spdData);
 
         const { pqcKey } = await new SPD().convertPasscodeToPQCKeySalted(passcode, new Uint8Array(salt));
         const pbk = pqcKey.publicKey;
         const spd = new SPD();
         spd.userKey = pbk;
         spd.keyPair = {
-            publicKey: Buffer.from(keyPair.publicKey)
+            publicKey: pbk.publicKey
         };
         spd.data = data.map(dat => ({
             dataName: dat.dataName,
@@ -117,15 +114,12 @@ this.salt = salt;
     }
 
     saveData() {
-        const keyPair = {
-            publicKey: Array.from(this.keyPair.publicKey)
-        };
-        const spdData = JSON.stringify({ keyPair, data: this.data, salt: Array.from(this.salt) });
+        const spdData = JSON.stringify({ data: this.data, salt: Array.from(this.salt) });
         const compressedSpdData = zlib.deflateSync(spdData);
         return compressedSpdData;
     }
 
-    async loadFromString(spdData, passcode) {
+    static async loadFromString(spdData, passcode) {
         if (!spdData || typeof spdData !== 'string' || !spdData.trim() || !passcode || typeof passcode !== 'string' || !passcode.trim()) {
             throw new Error('Invalid SPD path or passcode.');
         }
@@ -133,14 +127,14 @@ this.salt = salt;
         await sodium.ready;
         const spdDataBuffer = Buffer.from(spdData, 'base64');
         const spdData2 = zlib.inflateSync(spdDataBuffer).toString('utf8');
-        const { keyPair, data, salt } = JSON.parse(spdData2);
+        const { data, salt } = JSON.parse(spdData2);
       
         const { pqcKey } = await new SPD().convertPasscodeToPQCKeySalted(passcode, new Uint8Array(salt));
         const pbk = pqcKey.publicKey;
         const spd = new SPD();
         spd.userKey = pbk;
         spd.keyPair = {
-            publicKey: Buffer.from(keyPair.publicKey)
+            publicKey: pbk.publicKey
         };
         spd.data = data.map(dat => ({
             dataName: dat.dataName,
@@ -297,6 +291,18 @@ this.salt = salt;
     }
 }
 
-module.exports = {
-    SPD,
-};
+(async()=>{
+    const spd = new SPD();
+    const passcode = 'thisisatests';
+    await spd.setPassKey(passcode);
+    await spd.addData('test', 'test');
+    const data = spd.saveData().toString('base64')
+    console.log(data)
+    const LSPD =await SPD.loadFromString(data,passcode)
+    const ED = await LSPD.extractData();
+    console.log(ED);
+})()
+
+//module.exports = {
+//    SPD,
+//};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spd-lib",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "SPD or Secure Packaged Data is a compress PQC protected file format to store sensitive data localy",
   "main": "index.js",
   "scripts": {