[WIP][DEBUG] erp5_web_monitoring: fix jio storage

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.js

@@ -70,13 +70,26 @@
           return appcache_storage.repair(current_version);
         })
         .push(function () {
+          console.log("appcache repaired.");
           return jio_storage.repair();
         })
         .push(function () {
+          console.log("jio repaired.");
           return gadget.setSetting("migration_version", current_version);
         });
     })
 
+    .declareMethod('createStorage', function (options, monitoring_jio) {
+      var gadget = this;
+      if (options !== undefined) {
+        gadget.props.jio_storage = jIO.createJIO(options);
+        console.log("jio options created!");
+      } else {
+        gadget.props.jio_storage = jIO.createJIO(monitoring_jio);
+        console.log("monitoring_jio created!");
+      }
+    })
+
     .declareMethod('createJio', function (options) {
       var gadget = this, current_version, index, appcache_storage,
         monitoring_jio, appcache_jio, migration_version, manifest,
@@ -88,72 +101,105 @@
           migration_version = result_list[1];
           current_version = window.location.href.replace(window.location.hash, "");
           index = current_version.indexOf(window.location.host) + window.location.host.length;
-          current_version = current_version.substr(index);
-          if (migration_version !== current_version) {
-            //XXX is this a dirty hack?
-            indexedDB.deleteDatabase('monitoring-configuration-hash');
-            indexedDB.deleteDatabase('monitoring_local.db');
-          }
+          current_version = current_version.substr(index);/*
+          return;
+        })
+        .push(function () {
+          */
           manifest = "gadget_officejs_monitoring.configuration";
-          if (options !== undefined) {
-            gadget.props.jio_storage = jIO.createJIO(options);
-          } else {
-            monitoring_jio = {
-              type: "replicatedopml",
-              remote_storage_unreachable_status: "WARNING",
-              remote_opml_check_time_interval: 86400000,
-              request_timeout: 25000, // timeout is to 25 second
-              local_sub_storage: {
-                type: "query",
-                sub_storage: {
-                  type: "uuid",
-                  sub_storage: {
-                    type: "indexeddb",
-                    database: "monitoring_local.db"
-                  }
-                }
-              }
-            };
-            appcache_jio = {
-              type: "replicate",
-              parallel_operation_attachment_amount: 10,
-              parallel_operation_amount: 1,
-              conflict_handling: 2, //keep remote
-              signature_hash_key: 'hash',
-              check_remote_attachment_modification: true,
-              check_remote_attachment_creation: true,
-              check_remote_attachment_deletion: true,
-              check_remote_deletion: true,
-              check_local_creation: false,
-              check_local_deletion: false,
-              check_local_modification: false,
-              signature_sub_storage: {
-                type: "query",
+          monitoring_jio = {
+            type: "replicatedopml",
+            remote_storage_unreachable_status: "WARNING",
+            remote_opml_check_time_interval: 86400000,
+            request_timeout: 25000, // timeout is to 25 second
+            local_sub_storage: {
+              type: "query",
+              sub_storage: {
+                type: "uuid",
                 sub_storage: {
                   type: "indexeddb",
-                  database: "monitoring-configuration-hash"
+                  database: "monitoring_local.db"
                 }
-              },
-              local_sub_storage: JSON.parse(JSON.stringify(monitoring_jio)),
-              remote_sub_storage: {
-                type: "saferepair",
+              }
+            }
+          };
+          appcache_jio = {
+            type: "replicate",
+            parallel_operation_attachment_amount: 10,
+            parallel_operation_amount: 1,
+            conflict_handling: 2, //keep remote
+            signature_hash_key: 'hash',
+            check_remote_attachment_modification: true,
+            check_remote_attachment_creation: true,
+            check_remote_attachment_deletion: true,
+            check_remote_deletion: true,
+            check_local_creation: false,
+            check_local_deletion: false,
+            check_local_modification: false,
+            signature_sub_storage: {
+              type: "query",
+              sub_storage: {
+                type: "indexeddb",
+                database: "monitoring-configuration-hash"
+              }
+            },
+            local_sub_storage: JSON.parse(JSON.stringify(monitoring_jio)),
+            remote_sub_storage: {
+              type: "saferepair",
+              sub_storage: {
+                type: "configuration",
+                origin_url: origin_url,
+                hateoas_appcache: "hateoas_appcache",
+                manifest: manifest,
                 sub_storage: {
-                  type: "configuration",
+                  type: "appcache",
                   origin_url: origin_url,
-                  hateoas_appcache: "hateoas_appcache",
-                  manifest: manifest,
-                  sub_storage: {
-                    type: "appcache",
-                    origin_url: origin_url,
-                    manifest: manifest
-                  }
+                  manifest: manifest
                 }
               }
-            };
-            gadget.props.jio_storage = jIO.createJIO(monitoring_jio);
+            }
+          };
+          return gadget.createStorage(options, monitoring_jio);
+        })
+        .push(function () {
+          if (migration_version !== current_version) {
+            console.log("NEW APP VERSION! gadget.props.jio_storage:", gadget.props.jio_storage);
+            if (gadget.props.jio_storage) {
+              console.log("call jio_allDocs!");
+              return gadget.props.jio_storage.allDocs();
+            }
           }
+        })
+        .push(function (all_docs) {
+          console.log("all_docs:", all_docs);
+          if (all_docs && all_docs.data.total_rows) {
+            //iterate all docs, jio_remove, and recreate
+            //for gadget.jio_remove(options.jio_key);
+            var remove_queue = new RSVP.Queue(), i;
+            function remove_doc(id) {
+              remove_queue
+                .push(function () {
+                  return gadget.props.jio_storage.remove(id);
+                });
+            }
+            for (i = 0; i < all_docs.data.total_rows; i += 1) {
+              remove_doc(all_docs.data.rows[i].id);
+            }
+            return RSVP.all([
+              remove_queue,
+              gadget.createStorage(options, monitoring_jio),
+              gadget.setSetting("latest_import_date", undefined)
+            ]);
+          } else {
+            console.log("no new version, no delete");
+          }
+        })
+        .push(function () {
+          console.log("remove part done");
           if (migration_version !== current_version) {
+            console.log("new app version! recreate appcache and force repair");
             appcache_storage = jIO.createJIO(appcache_jio);
+            console.log("appcache_jio created");
             return gadget.updateConfiguration(appcache_storage, migration_version, current_version, gadget.props.jio_storage);
           }
         })

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/gadget_officejs_monitoring_jio_js.xml

@@ -249,7 +249,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1015.31731.39115.52974</string> </value>
+                      <value> <string>1015.31834.14596.52957</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -269,7 +269,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1711481527.41</float>
+                              <float>1711494540.44</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.js

@@ -154,11 +154,16 @@
     var storage = this._local_sub_storage;
     return storage.get(id)
       .push(function (doc) {
+        console.log("monitoring jio storage REMOVE. id:", id);
+        console.log("with portal_type:", doc.portal_type);
         if (doc.portal_type !== 'opml') {
-          throw new TypeError("Object with portal_type" + doc.portal_type +
-                              "is frozen, cannot remove it.");
+          console.log("portal_type !== 'opml'! just jio remove");
+          return storage.remove(id);
+          /*throw new TypeError("Object with portal_type" + doc.portal_type +
+                              "is frozen, cannot remove it.");*/
         }
         function removeOPMLTree(url) {
+          console.log("portal_type 'opml'! complex opml remove");
           var remove_id_list = [],
             remove_signature_id_list = [];
 

bt5/erp5_web_monitoring/PathTemplateItem/web_page_module/monitoring_jio_storage_js.xml

@@ -249,7 +249,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1014.13769.50435.48776</string> </value>
+                      <value> <string>1015.31816.24445.1945</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -269,7 +269,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1706644494.36</float>
+                              <float>1711486812.33</float>
                               <string>UTC</string>
                             </tuple>
                           </state>