put simplest, asynchronous local storage operations in a separate file

2 files changed, 79 insertions, 87 deletions

diff --git a/background/storage.js b/background/storage.js
index c2160b0..12c0c61 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -7,7 +7,7 @@
 
 /*
  * IMPORTS_START
- * IMPORT TYPE_PREFIX
+ * IMPORT raw_storage
  * IMPORT TYPE_NAME
  * IMPORT list_prefixes
  * IMPORT make_lock
@@ -15,76 +15,17 @@
  * IMPORT unlock
  * IMPORT make_once
  * IMPORT browser
- * IMPORT is_chrome
  * IMPORT observables
  * IMPORTS_END
  */
 
 var exports = {};
 
-/* We're yet to decide how to handle errors... */
-
-/* Here are some basic wrappers for storage API functions */
-
-async function get(key)
-{
-    try {
-	/* Fix for fact that Chrome does not use promises here */
-	let promise = is_chrome ?
-	    new Promise((resolve, reject) =>
-			chrome.storage.local.get(key,
-						 val => resolve(val))) :
-	    browser.storage.local.get(key);
-
-	return (await promise)[key];
-    } catch (e) {
-	console.log(e);
-    }
-}
-
-async function set(key, value)
-{
-    try {
-	return browser.storage.local.set({[key]: value});
-    } catch (e) {
-	console.log(e);
-    }
-}
-
-async function setn(keys_and_values)
-{
-    let obj = Object();
-    while (keys_and_values.length > 1) {
-	let value = keys_and_values.pop();
-	let key = keys_and_values.pop();
-	obj[key] = value;
-    }
-
-    try {
-	return browser.storage.local.set(obj);
-    } catch (e) {
-	console.log(e);
-    }
-}
-
-async function set_var(name, value)
-{
-    return set(TYPE_PREFIX.VAR + name, value);
-}
-
-async function get_var(name)
-{
-    return get(TYPE_PREFIX.VAR + name);
-}
-
-/*
- * A special case of persisted variable is one that contains list
- * of items.
- */
+/* A special case of persisted variable is one that contains list of items. */
 
 async function get_list_var(name)
 {
-    let list = await get_var(name);
+    let list = await raw_storage.get_var(name);
 
     return list === undefined ? [] : list;
 }
@@ -97,7 +38,7 @@ async function list(prefix)
     let map = new Map();
 
     for (let item of await get_list_var(name))
-	map.set(item, await get(prefix + item));
+	map.set(item, await raw_storage.get(prefix + item));
 
     return {map, prefix, name, observable: observables.make(),
 	    lock: make_lock()};
@@ -175,19 +116,19 @@ async function set_item(item, value, list)
 }
 async function _set_item(item, value, list)
 {
-    let key = list.prefix + item;
-    let old_val = list.map.get(item);
+    const key = list.prefix + item;
+    const old_val = list.map.get(item);
+    const set_obj = {[key]: value};
     if (old_val === undefined) {
-	let items = list_items(list);
+	const items = list_items(list);
 	items.push(item);
-	await setn([key, value, "_" + list.name, items]);
-    } else {
-	await set(key, value);
+	set_obj["_" + list.name] = items;
     }
 
-    list.map.set(item, value)
+    await raw_storage.set(set_obj);
+    list.map.set(item, value);
 
-    let change = {
+    const change = {
 	prefix : list.prefix,
 	item,
 	old_val,
@@ -212,20 +153,21 @@ async function remove_item(item, list)
 }
 async function _remove_item(item, list)
 {
-    let old_val = list.map.get(item);
+    const old_val = list.map.get(item);
     if (old_val === undefined)
 	return;
 
-    let key = list.prefix + item;
-    let items = list_items(list);
-    let index = items.indexOf(item);
+    const items = list_items(list);
+    const index = items.indexOf(item);
     items.splice(index, 1);
 
-    await setn([key, undefined, "_" + list.name, items]);
-
+    await raw_storage.set({
+	[list.prefix + item]: undefined,
+	["_" + list.name]: items
+    });
     list.map.delete(item);
 
-    let change = {
+    const change = {
 	prefix : list.prefix,
 	item,
 	old_val,
@@ -247,11 +189,11 @@ async function replace_item(old_item, new_item, list, new_val=undefined)
 }
 async function _replace_item(old_item, new_item, list, new_val=undefined)
 {
-    let old_val = list.map.get(old_item);
+    const old_val = list.map.get(old_item);
     if (new_val === undefined) {
 	if (old_val === undefined)
 	    return;
-	new_val = old_val
+	new_val = old_val;
     } else if (new_val === old_val && new_item === old_item) {
 	return old_val;
     }
@@ -261,17 +203,18 @@ async function _replace_item(old_item, new_item, list, new_val=undefined)
 	return old_val;
     }
 
-    let new_key = list.prefix + new_item;
-    let old_key = list.prefix + old_item;
-    let items = list_items(list);
-    let index = items.indexOf(old_item);
+    const items = list_items(list);
+    const index = items.indexOf(old_item);
     items[index] = new_item;
-    await setn([old_key, undefined, new_key, new_val,
-		"_" + list.name, items]);
 
+    await raw_storage.set({
+	[list.prefix + old_item]: undefined,
+	[list.prefix + new_item]: new_val,
+	["_" + list.name]: items
+    });
     list.map.delete(old_item);
 
-    let change = {
+    const change = {
 	prefix : list.prefix,
 	item : old_item,
 	old_val,
diff --git a/common/storage_raw.js b/common/storage_raw.js
new file mode 100644
index 0000000..9ce3980
--- /dev/null
+++ b/common/storage_raw.js
@@ -0,0 +1,49 @@
+/**
+ * part of Hachette
+ * Basic wrappers for storage API functions.
+ *
+ * Copyright (C) 2021 Wojtek Kosior
+ * Redistribution terms are gathered in the `copyright' file.
+ */
+
+/*
+ * IMPORTS_START
+ * IMPORT TYPE_PREFIX
+ * IMPORT browser
+ * IMPORT is_chrome
+ * IMPORTS_END
+ */
+
+async function get(key)
+{
+    /* Fix for fact that Chrome does not use promises here */
+    const promise = is_chrome ?
+	  new Promise(resolve => chrome.storage.local.get(key, resolve)) :
+	  browser.storage.local.get(key);
+
+    return (await promise)[key];
+}
+
+async function set(key_or_object, value)
+{
+    return browser.storage.local.set(typeof key_or_object === "object" ?
+				     key_or_object : {[key]: value});
+}
+
+async function set_var(name, value)
+{
+    return set(TYPE_PREFIX.VAR + name, value);
+}
+
+async function get_var(name)
+{
+    return get(TYPE_PREFIX.VAR + name);
+}
+
+const raw_storage = {get, set, get_var, set_var};
+
+/*
+ * EXPORTS_START
+ * EXPORT raw_storage
+ * EXPORTS_END
+ */