opfs auto-cleanup

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          delivery-calculator
-version:       0.1.0.14
+version:       0.1.0.15
 synopsis:      Delivery Calculator
 category:      Web
 build-type:    Simple

ghcjs/delivery-calculator/src/App/Types.hs

@@ -174,7 +174,7 @@ newAsset = do
     either throw pure . decodeUtf8Strict . unTagged . htmlUid =<< newUid
   let opts =
         BlobOpts
-          { blobOptsOpfsDir = Just $ "delivery-calculator-" <> vsn,
+          { blobOptsOpfsDir = Just $ "delivery-calculator-images",
             blobOptsOpfsFile = Just opfs,
             blobOptsMaxSizeKb = Just 400000
           }

ghcjs/delivery-calculator/src/Main.hs

@@ -20,6 +20,7 @@ import App.Widgets.Main
 import App.Widgets.Templates
 import qualified Data.Generics as Syb
 import qualified Data.Map as Map
+import qualified Data.Set as Set
 import qualified Functora.Miso.Jsm as Jsm
 import Functora.Miso.Prelude
 import qualified Functora.Money as Money
@@ -131,7 +132,7 @@ updateModel (InitUpdate ext) prevSt = do
           . PureUpdate
           $ #modelLoading
           .~ False
-        opfsRead sink nextSt
+        opfsSync sink nextSt
       else Jsm.selectStorage ("current-" <> vsn) $ \case
         Nothing -> do
           liftIO
@@ -140,7 +141,7 @@ updateModel (InitUpdate ext) prevSt = do
             . PureUpdate
             $ #modelLoading
             .~ False
-          opfsRead sink nextSt
+          opfsSync sink nextSt
         Just uri -> do
           finSt <- newModel (nextSt ^. #modelWebOpts) mvSink (Just nextSt) uri
           liftIO
@@ -152,7 +153,7 @@ updateModel (InitUpdate ext) prevSt = do
                   & #modelLoading
                   .~ False
               )
-          opfsRead sink finSt
+          opfsSync sink finSt
     liftIO
       . sink
       . PushUpdate
@@ -443,6 +444,11 @@ syncUri uri = do
             $ URI.renderStr nextUri
         )
 
+opfsSync :: (Action -> IO ()) -> Model -> JSM ()
+opfsSync sink st = do
+  opfsRead sink st
+  opfsFree st
+
 opfsRead :: (Action -> IO ()) -> Model -> JSM ()
 opfsRead sink st =
   forM_ (zip [0 ..] assets) . uncurry $ \assetIdx asset -> do
@@ -478,3 +484,39 @@ opfsRead sink st =
               )
   where
     assets = st ^. #modelState . #stAssets
+
+--
+-- NOTE : test with
+--
+-- const root = await navigator.storage.getDirectory(); for await (let name of root.keys()) {console.log(name);} const dir = await root.getDirectoryHandle("delivery-calculator-images"); for await (let name of dir.keys()) {console.log(name);}
+--
+opfsFree :: Model -> JSM ()
+opfsFree st =
+  forM_ groups $ \case
+    items@((dir, _) : _) ->
+      Jsm.opfsList dir $ \case
+        Nothing -> pure ()
+        Just opfsFiles -> do
+          let modelFiles = fromList $ fmap snd items
+          forM_ opfsFiles $ \file ->
+            when (Set.notMember file modelFiles)
+              $ Jsm.opfsRemove
+                defBlobOpts
+                  { blobOptsOpfsDir = Just dir,
+                    blobOptsOpfsFile = Just file
+                  }
+    _ ->
+      pure ()
+  where
+    groups :: [[(Unicode, Unicode)]]
+    groups =
+      groupAllOn fst
+        . catMaybes
+        . map
+          ( \x ->
+              (,)
+                <$> (x ^. #fieldBlobOpts . #blobOptsOpfsDir)
+                <*> (x ^. #fieldBlobOpts . #blobOptsOpfsFile)
+          )
+        . Syb.listify (\(_ :: Field DynamicField Unique) -> True)
+        $ modelState st

ghcjs/delivery-calculator/trapeze.yaml

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Delivery Calculator
-    versionCode: 14
-    versionName: 0.1.0.14
+    versionCode: 15
+    versionName: 0.1.0.15
     packageName: com.functora.delivery_calculator
     manifest:
       - file: AndroidManifest.xml

ghcjs/miso-functora/js/main.js

@@ -31,10 +31,13 @@ export async function insertStorage(key, value) {
 }
 
 export async function compressImage(prevImage, maxSizeKb) {
-  let opts = { quality: 1 };
+  //
+  // TODO : default quality option
+  //
+  let opts = { quality: 0.2 };
   if (maxSizeKb) {
     opts = {
-      quality: Math.min(1, maxSizeKb / prevImage.size),
+      quality: Math.min(0.2, maxSizeKb / prevImage.size),
       maxWidth: 768,
       maxHeight: 768,
     };
@@ -79,7 +82,15 @@ export async function resolveDataUrl(value, opts = {}) {
       blob = await compressImage(blob, maxSizeKb);
     }
     if (opts.opfsDir && opts.opfsFile) {
-      await opfsWrite(value, opts);
+      const rfc2397 = await new Promise((resolve, reject) => {
+        var fr = new FileReader();
+        fr.onload = () => {
+          resolve(fr.result);
+        };
+        fr.onerror = reject;
+        fr.readAsDataURL(blob);
+      });
+      await opfsWrite(rfc2397, opts);
     }
     return URL.createObjectURL(blob);
   } catch (e) {