@breakside/jskit 2022.3.1 → 2022.7.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2022.3.1",
+  "JSBundleVersion": "2022.7.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "DOM+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+  "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
 }

package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-    "JSBundleVersion": "2022.3.1",
+    "JSBundleVersion": "2022.7.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
       "node": "DOM+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+    "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2022.3.1",
+  "JSBundleVersion": "2022.7.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
     "html": "FontKit+HTML.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+  "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
 }

package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-    "JSBundleVersion": "2022.3.1",
+    "JSBundleVersion": "2022.7.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
       "html": "FontKit+HTML.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+    "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2022.3.1",
+  "JSBundleVersion": "2022.7.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "Foundation+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+  "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
 }

package/Frameworks/Foundation.jsframework/JS/JSUserDefaults.js

@@ -29,12 +29,17 @@ var logger = JSLog("foundation", "user-defaults");
 JSClass("JSUserDefaults", JSObject, {
 
     identifier: JSReadOnlyProperty('_identifier', null),
+    _fileManager: null,
     _defaults: null,
     _values: null,
 
-    initWithIdentifier: function(identifier){
+    initWithIdentifier: function(identifier, fileManager){
+        if (fileManager === undefined){
+            fileManager = JSFileManager.shared;
+        }
+        this._fileManager = fileManager;
         this._identifier = identifier;
-        this._url = JSFileManager.shared.persistentContainerURL.appendingPathComponents(['Preferences', '%s.prefs.json'.sprintf(this._identifier)]);
+        this._url = this._fileManager.persistentContainerURL.appendingPathComponents(['Preferences', '%s.prefs.json'.sprintf(this._identifier)]);
         this._defaults = {};
     },
 
@@ -42,7 +47,7 @@ JSClass("JSUserDefaults", JSObject, {
         if (!completion){
             completion = Promise.completion(Promise.resolveTrue);
         }
-        JSFileManager.shared.contentsAtURL(this._url, function JSUserDefaults_open_contents(data){
+        this._fileManager.contentsAtURL(this._url, function JSUserDefaults_open_contents(data){
             try{
                 if (data !== null){
                     var json = String.initWithData(data, String.Encoding.utf8);
@@ -60,6 +65,19 @@ JSClass("JSUserDefaults", JSObject, {
     },
 
     close: function(completion, target){
+        if (!completion){
+            completion = Promise.completion(Promise.resolveTrue);
+        }
+        this.synchronize(function(success){
+            if (success){
+                this._values = null;
+            }
+            completion.call(target, success);
+        }, this);
+        return completion.promise;
+    },
+
+    synchronize: function(completion, target){
         if (!completion){
             completion = Promise.completion(Promise.resolveTrue);
         }
@@ -75,9 +93,6 @@ JSClass("JSUserDefaults", JSObject, {
         }
         if (needsSave){
             this._persist(function JSUserDefaults_close_persisted(success){
-                if (success){
-                    this._values = null;
-                }
                 completion.call(target, success);
             }, this);
         }else{
@@ -89,6 +104,9 @@ JSClass("JSUserDefaults", JSObject, {
     // MARK: - Getting and Setting values
 
     valueForKey: function(key){
+        if (this._values === null){
+            throw new Error("JSUserDefaults is closed, cannot get value.  Be sure to call open() first.");
+        }
         if (key in this._values){
             return this._values[key];
         }
@@ -99,6 +117,9 @@ JSClass("JSUserDefaults", JSObject, {
     },
 
     setValueForKey: function(value, key){
+        if (this._values === null){
+            throw new Error("JSUserDefaults is closed, cannot set value.  Be sure to call open() first.");
+        }
         this._values[key] = value;
         this._persistAfterDelay();
         this._definePropertyForKey(key);
@@ -161,7 +182,7 @@ JSClass("JSUserDefaults", JSObject, {
         }else{
             var data = JSON.stringify(this._values).utf8();
             logger.info("saving user defaults");
-            JSFileManager.shared.createFileAtURL(this._url, data, function JSUserDefaults_persist_createFile(success){
+            this._fileManager.createFileAtURL(this._url, data, function JSUserDefaults_persist_createFile(success){
                 if (!success){
                     logger.error("failed to write user defaults");
                 }else{

package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-    "JSBundleVersion": "2022.3.1",
+    "JSBundleVersion": "2022.7.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
       "node": "Foundation+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+    "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
   },
   "Resources": [
     {

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2022.3.1",
+  "JSBundleVersion": "2022.7.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "SecurityKit+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+  "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
 }

package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-    "JSBundleVersion": "2022.3.1",
+    "JSBundleVersion": "2022.7.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
       "node": "SecurityKit+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+    "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
   },
   "Resources": [],
   "ResourceLookup": {

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2022.3.1",
+  "JSBundleVersion": "2022.7.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+  "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
 }

package/Node/Docs/DocComponent.js

@@ -275,6 +275,16 @@ JSClass("DocComponent", JSObject, {
             script = head.appendChild(document.createElement('script'));
             script.appendChild(document.createTextNode(googleAnalyticsTemplate.replacingTemplateParameters({TRACKING_ID: page.googleAnalytics, PATH: path})));
         }
+        if (page.telemetryKey){
+            let path = this.outputURL.removingFileExtension().encodedStringRelativeTo(documentation.wwwURL);
+            if (path == 'index'){
+                path = '/';
+            }else{
+                path = '/' + path;
+            }
+            let script = head.appendChild(document.createElement('script'));
+            script.appendChild(document.createTextNode(telemetryTemplate.replacingTemplateParameters({KEY: page.telemetryKey, PATH: path})));
+        }
         var breadcrumb = this.jsonLdBreadcrumbList();
         if (breadcrumb){
             let script = head.appendChild(document.createElement("script"));
@@ -884,6 +894,7 @@ JSClass("DocComponent", JSObject, {
 });
 
 var googleAnalyticsTemplate = "window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', '{{TRACKING_ID}}', {page_path: '{{PATH}}'});";
+var telemetryTemplate = "(function(w, d){ var key = '{{KEY}}'; var s = d.createElement('script'); s.async = true; s.src = 'https://api.telemetry.rocketlaunch.studio/client/telemetry.js'; s.setAttribute('data-key', key); var e = (d.currentScript || d.head.childNodes[d.head.childNodes.length - 1]); e.parentNode.insertBefore(s, e); w._telemetry = function(){ _telemetry.q.push(arguments); }; _telemetry.q = []; })(window, document); _telemetry('count', 'screen', '{{PATH}}');";
 
 DocComponent.Environments = [{id: 'html', name: 'HTML'}, {id: 'node', name: 'Node'}];
 

package/Node/io.breakside.jskit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2022.3.1",
+    "JSBundleVersion": "2022.7.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "058d16cc912875ff9af21c0dc4aebf24df0c9ce3"
+    "GitRevision": "0c7fd41e9df334845f377bdde35e29dca1b45490"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKit
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSIncludeDirectories:

package/Root/Frameworks/APIKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKitTesting
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/AuthKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.AuthKit
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/CSSOM/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.CSSOM
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ChartKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ChartKit
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 # JSBundleEnvironments:

package/Root/Frameworks/ConferenceKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ConferenceKit
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/DBKit/DBMongoStore.js

@@ -40,6 +40,7 @@ JSClass("DBMongoStore", DBObjectStore, {
         this.databaseName = url.pathComponents[1];
         url = url.copy();
         url.path = null;
+        url.query.set("retryWrites", "false");
         this.tlsCertificateName = url.query.get("ssl_ca_certs", null);
         if (this.tlsCertificateName !== null){
             url.query.unset("ssl_ca_certs");

package/Root/Frameworks/DBKit/DBRedisStore.js

@@ -41,7 +41,7 @@ JSClass("DBRedisStore", DBObjectStore, {
 
     open: function(completion){
         logger.info("Redis client connecting to %{public}:%d...", this.url.host, this.url.port || 6379);
-        this.client = this.redis.createClient({url: this.url.encodedString});
+        this.client = this.redis.createClient({url: this.url.encodedString, legacyMode: true});
         var store = this;
         var errorHandler = function(error){
             logger.info("Failed to open Redis connection: %{error}", error);
@@ -67,8 +67,12 @@ JSClass("DBRedisStore", DBObjectStore, {
                 store.close(fn);
             }
         };
-        this.client.on("error", errorHandler);
-        this.client.on("ready", readyHandler);
+        if (this.client.connect){
+            this.client.connect().then(readyHandler, errorHandler);
+        }else{
+            this.client.on("error", errorHandler);
+            this.client.on("ready", readyHandler);
+        }
     },
 
     closeCallback: null,
@@ -233,7 +237,7 @@ JSClass("DBRedisStore", DBObjectStore, {
 
     watchClientQueue: null,
 
-    dequeueReusableWatchClient: function(){
+    dequeueReusableWatchClient: function(completion, target){
         if (this.watchClientQueue === null){
             this.watchClientQueue = [];
         }
@@ -245,7 +249,17 @@ JSClass("DBRedisStore", DBObjectStore, {
             return this.watchClientQueue.shift();
         }
         logger.info("opening watch client to %{public}:%d", this.url.host, this.url.port || 6379);
-        return this.redis.createClient({url: this.url.encodedString});
+        var client = this.redis.createClient({url: this.url.encodedString, legacyMode: true});
+        if (client.connect){
+            client.connect().then(function(){
+                completion.call(target, client);
+            }, function(error){
+                logger.error("Error connecting to watch client: %{error}", error);
+                completion.call(target, null);
+            });
+        }else{
+            completion.call(target, client);
+        }
     },
 
     enqueueReusableWatchClient: function(client){
@@ -277,120 +291,125 @@ JSClass("DBRedisStore", DBObjectStore, {
     },
 
     exclusiveSave: function(id, change, completion){
-        var watchClient = this.dequeueReusableWatchClient();
-        var maxRetires = 30;
-        var waitInterval = JSTimeInterval.milliseconds(20);
-        var retires = 0;
-        var store = this;
-        var trySave = function(){
-            try{
-                watchClient.watch(id, function(error){
-                    if (error !== null){
-                        logger.error("Failure calling redis watch: %{error}", error);
-                        watchClient.quit();
-                        completion(false);
-                        return;
-                    }
-                    try{
-                        watchClient.get(id, function(error, json){
-                            if (error !== null){
-                                logger.error("Failure calling redis get: %{error}", error);
-                                watchClient.quit();
-                                completion(false);
-                                return;
-                            }
-                            var object = null;
-                            try{
-                                object = JSON.parse(json);
-                            }catch (e){
-                                logger.error("Failure parsing object json: %{error}", error);
-                                watchClient.quit();
-                                completion(false);
-                                return;
-                            }
-                            try{
-                                watchClient.ttl(id, function(error, ttl){
-                                    if (error !== null){
-                                        logger.error("Failure calling redis ttl: %{error}", error);
-                                        watchClient.quit();
-                                        completion(false);
-                                        return;
-                                    }
-                                    try{
-                                        change(object, function(changedObject){
-                                            if (changedObject === null){
-                                                watchClient.quit();
-                                                completion(false);
-                                                return;
-                                            }
-                                            var changedJSON = null;
-                                            try{
-                                                changedJSON = JSON.stringify(changedObject);
-                                            }catch (e){
-                                                logger.error("Failed to serialize object for redis: %{error}", e);
-                                                watchClient.quit();
-                                                completion(false);
-                                                return;
-                                            }
-                                            var args = [id, changedJSON];
-                                            if (ttl > 0){
-                                                args.push("EX");
-                                                args.push(ttl);
-                                            }
-                                            try{
-                                                watchClient.multi().set(args).exec(function(error, results){
-                                                    if (error !== null){
-                                                        logger.error("Failure calling redis multi/set/exec: %{error}", error);
-                                                        watchClient.quit();
-                                                        completion(false);
-                                                        return;
-                                                    }
-                                                    if (results === null){
-                                                        // null results means the transaction failed, so it's our signal to retry
-                                                        ++retires;
-                                                        if (retires > maxRetires){
-                                                            store.enqueueReusableWatchClient(watchClient);
-                                                            completion(true);
-                                                            return;
-                                                        }
-                                                        JSTimer.scheduledTimerWithInterval(waitInterval, trySave);
-                                                        waitInterval = Math.min(1, waitInterval * 2);
-                                                        return;
-                                                    }
-                                                    store.enqueueReusableWatchClient(watchClient);
-                                                    completion(true);
-                                                });
-                                            }catch (e){
-                                                logger.error("Error thrown calling redis multi/set/exec: %{error}", e);
-                                                watchClient.quit();
-                                                completion(false);
-                                            }
-                                        });
-                                    }catch (e){
-                                        logger.error("Error thrown calling change function: %{error}", e);
-                                        watchClient.quit();
-                                        completion(false);
-                                    }
-                                });
-                            }catch (e){
-                                logger.error("Error thrown calling redis ttl: %{error}", error);
-                                watchClient.quit();
-                                completion(false);
-                            }
-                        });
-                    }catch (e){
-                        logger.error("Error thrown calling redis get: %{error}", error);
-                        watchClient.quit();
-                        completion(false);
-                    }
-                });
-            }catch (e){
-                logger.error("Error thrown calling redis watch: %{error}", e);
-                watchClient.quit();
+        this.dequeueReusableWatchClient(function(watchClient){
+            if (watchClient === null){
                 completion(false);
+                return;
             }
-        };
-        trySave();
+            var maxRetires = 30;
+            var waitInterval = JSTimeInterval.milliseconds(20);
+            var retires = 0;
+            var store = this;
+            var trySave = function(){
+                try{
+                    watchClient.watch(id, function(error){
+                        if (error !== null){
+                            logger.error("Failure calling redis watch: %{error}", error);
+                            watchClient.quit();
+                            completion(false);
+                            return;
+                        }
+                        try{
+                            watchClient.get(id, function(error, json){
+                                if (error !== null){
+                                    logger.error("Failure calling redis get: %{error}", error);
+                                    watchClient.quit();
+                                    completion(false);
+                                    return;
+                                }
+                                var object = null;
+                                try{
+                                    object = JSON.parse(json);
+                                }catch (e){
+                                    logger.error("Failure parsing object json: %{error}", error);
+                                    watchClient.quit();
+                                    completion(false);
+                                    return;
+                                }
+                                try{
+                                    watchClient.ttl(id, function(error, ttl){
+                                        if (error !== null){
+                                            logger.error("Failure calling redis ttl: %{error}", error);
+                                            watchClient.quit();
+                                            completion(false);
+                                            return;
+                                        }
+                                        try{
+                                            change(object, function(changedObject){
+                                                if (changedObject === null){
+                                                    watchClient.quit();
+                                                    completion(false);
+                                                    return;
+                                                }
+                                                var changedJSON = null;
+                                                try{
+                                                    changedJSON = JSON.stringify(changedObject);
+                                                }catch (e){
+                                                    logger.error("Failed to serialize object for redis: %{error}", e);
+                                                    watchClient.quit();
+                                                    completion(false);
+                                                    return;
+                                                }
+                                                var args = [id, changedJSON];
+                                                if (ttl > 0){
+                                                    args.push("EX");
+                                                    args.push(ttl);
+                                                }
+                                                try{
+                                                    watchClient.multi().set(args).exec(function(error, results){
+                                                        if (error !== null){
+                                                            logger.error("Failure calling redis multi/set/exec: %{error}", error);
+                                                            watchClient.quit();
+                                                            completion(false);
+                                                            return;
+                                                        }
+                                                        if (results === null){
+                                                            // null results means the transaction failed, so it's our signal to retry
+                                                            ++retires;
+                                                            if (retires > maxRetires){
+                                                                store.enqueueReusableWatchClient(watchClient);
+                                                                completion(true);
+                                                                return;
+                                                            }
+                                                            JSTimer.scheduledTimerWithInterval(waitInterval, trySave);
+                                                            waitInterval = Math.min(1, waitInterval * 2);
+                                                            return;
+                                                        }
+                                                        store.enqueueReusableWatchClient(watchClient);
+                                                        completion(true);
+                                                    });
+                                                }catch (e){
+                                                    logger.error("Error thrown calling redis multi/set/exec: %{error}", e);
+                                                    watchClient.quit();
+                                                    completion(false);
+                                                }
+                                            });
+                                        }catch (e){
+                                            logger.error("Error thrown calling change function: %{error}", e);
+                                            watchClient.quit();
+                                            completion(false);
+                                        }
+                                    });
+                                }catch (e){
+                                    logger.error("Error thrown calling redis ttl: %{error}", error);
+                                    watchClient.quit();
+                                    completion(false);
+                                }
+                            });
+                        }catch (e){
+                            logger.error("Error thrown calling redis get: %{error}", error);
+                            watchClient.quit();
+                            completion(false);
+                        }
+                    });
+                }catch (e){
+                    logger.error("Error thrown calling redis watch: %{error}", e);
+                    watchClient.quit();
+                    completion(false);
+                }
+            };
+            trySave();
+        }, this);
     },
 
     saveChange: function(change, completion){