Fix storage paths, update INI parser (#377)

package.json

@@ -34,7 +34,7 @@
     "@reduxjs/toolkit": "^1.7.1",
     "@sentry/react": "^6.16.1",
     "@sentry/tracing": "^6.16.1",
-    "@speedy-tuner/ini": "^0.2.2",
+    "@speedy-tuner/ini": "^0.3.0",
     "@speedy-tuner/types": "^0.3.0",
     "antd": "^4.18.3",
     "firebase": "^9.6.3",
@@ -54,7 +54,6 @@
   "devDependencies": {
     "@craco/craco": "^6.4.3",
     "@speedy-tuner/eslint-config": "^0.1.3",
-    "@types/d3": "^7.0.0",
     "@types/node": "^17.0.8",
     "@types/pako": "^1.0.3",
     "@types/react": "^17.0.38",

src/hooks/useServerStorage.ts

@@ -9,7 +9,7 @@ import {
   uploadBytesResumable,
 } from '../firebase';
 
-const TUNES_PATH = 'public/users';
+const BASE_PATH = 'public/users';
 
 const genericError = (error: Error) => notification.error({ message: 'Database Error', description: error.message });
 
@@ -30,7 +30,7 @@ const useServerStorage = () => {
 
   const removeFile = async (path: string) => {
     try {
-      await deleteObject(storageRef(storage, `${TUNES_PATH}/${path}`));
+      await deleteObject(storageRef(storage, path));
 
       return Promise.resolve();
     } catch (error) {
@@ -43,7 +43,7 @@ const useServerStorage = () => {
   };
 
   const uploadFile = (path: string, file: File, data: Uint8Array) =>
-    uploadBytesResumable(storageRef(storage, `${TUNES_PATH}/${path}`), data, {
+    uploadBytesResumable(storageRef(storage, path), data, {
       customMetadata: {
         name: file.name,
         size: `${file.size}`,
@@ -54,6 +54,7 @@ const useServerStorage = () => {
     getFile: (path: string): Promise<ArrayBuffer> => getFile(path),
     removeFile: (path: string): Promise<void> => removeFile(path),
     uploadFile: (path: string, file: File, data: Uint8Array): UploadTask => uploadFile(path, file, data),
+    basePathForFile: (userUuid: string, tuneId: string, fileName: string): string => `${BASE_PATH}/${userUuid}/tunes/${tuneId}/${fileName}`,
   };
 };
 

src/pages/Upload.tsx

@@ -114,8 +114,8 @@ const UploadPage = () => {
   const { currentUser, refreshToken } = useAuth();
   const history = useHistory();
   const { storageSet, storageGet, storageDelete } = useBrowserStorage();
+  const { removeFile, uploadFile, basePathForFile } = useServerStorage();
   const { updateData, getTune } = useDb();
-  const { removeFile, uploadFile } = useServerStorage();
   const requiredRules = [{ required: true, message: 'This field is required!' }];
   const [readme, setReadme] = useState('# My Tune\n\ndescription');
 
@@ -201,23 +201,23 @@ const UploadPage = () => {
   };
 
   const tuneFileData = () => ({
-    path: `${currentUser!.uid}/tunes/${newTuneId}/${nanoid()}.msq.gz`,
+    path: basePathForFile(currentUser!.uid, newTuneId!, `tune/${nanoid()}.msq.gz`),
   });
 
   const logFileData = (file: UploadFile) => {
     const { name } = file;
     const extension = name.split('.').pop();
     return {
-      path: `${currentUser!.uid}/tunes/${newTuneId}/logs/${nanoid()}.${extension}.gz`,
+      path: basePathForFile(currentUser!.uid, newTuneId!, `logs/${nanoid()}.${extension}.gz`),
     };
   };
 
   const toothLogFilesData = () => ({
-    path: `${currentUser!.uid}/tunes/${newTuneId}/tooth-logs/${nanoid()}.csv.gz`,
+    path: basePathForFile(currentUser!.uid, newTuneId!, `tooth-logs/${nanoid()}.csv.gz`),
   });
 
   const customIniFileData = () => ({
-    path: `${currentUser!.uid}/tunes/${newTuneId}/${nanoid()}.ini.gz`,
+    path: basePathForFile(currentUser!.uid, newTuneId!, `ini/${nanoid()}.ini.gz`),
   });
 
   const uploadTune = async (options: UploadRequestOption) => {
@@ -347,10 +347,15 @@ const UploadPage = () => {
         return { result, message };
       }
 
-      // TODO: change to common interface, add some validation method
+      let validationMessage = 'INI file is empty or not valid!';
-      // Create INI parser
+      let valid = false;
-      const parser = new INI((new TextDecoder()).decode(await file.arrayBuffer()));
+      try {
-      const valid = parser.parse().megaTune.signature.length > 0;
+        const parser = new INI(await file.arrayBuffer()).parse();
+        valid = parser.getResults().megaTune.signature.length > 0;
+      } catch (error) {
+        valid = false;
+        validationMessage = (error as Error).message;
+      }
 
       if (valid) {
         setCustomIniFile(tune);
@@ -358,7 +363,7 @@ const UploadPage = () => {
 
       return {
         result: valid,
-        message: 'INI file is empty or not valid!',
+        message: validationMessage,
       };
     });
   };

src/utils/api.ts

@@ -22,7 +22,7 @@ export const loadTune = async (tuneRaw: ArrayBuffer, iniRaw: ArrayBuffer) => {
   }
 
   const buff = pako.inflate(new Uint8Array(iniRaw));
-  const config = new INI((new TextDecoder()).decode(buff)).parse();
+  const config = new INI(buff).parse().getResults();
 
   // override / merge standard dialogs, constants and help
   config.dialogs = {