@breakside/jskit 2022.3.1 → 2022.7.0

package/Root/Frameworks/DBKit/Info.yaml

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

package/Root/Frameworks/DOM/Info.yaml

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

package/Root/Frameworks/Dispatch/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.Dispatch
-JSBundleVersion: 2022.3.1
+JSBundleVersion: 2022.7.0
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:
   html: Dispatch+HTML.js

package/Root/Frameworks/FontKit/Info.yaml

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

package/Root/Frameworks/Foundation/Info.yaml

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

package/Root/Frameworks/Foundation/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/Root/Frameworks/ImageKit/IKMatrix.js

@@ -1,4 +1,4 @@
-// // Copyright 2022 Breakside Inc.
+// Copyright 2022 Breakside Inc.
 //
 // Licensed under the Breakside Public License, Version 1.0 (the "License");
 // you may not use this file except in compliance with the License.

package/Root/Frameworks/ImageKit/Info.yaml

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

package/Root/Frameworks/MediaKit/Info.yaml

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

package/Root/Frameworks/MediaKitUI/Info.yaml

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

package/Root/Frameworks/NotificationKit/Info.yaml

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

package/Root/Frameworks/PDFKit/Info.yaml

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

package/Root/Frameworks/QRKit/Info.yaml

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

package/Root/Frameworks/SearchKit/Info.yaml

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

package/Root/Frameworks/SecurityKit/Info.yaml

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

package/Root/Frameworks/ServerKit/Info.yaml

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

package/Root/Frameworks/ServerKit/SKAMQPJobQueue.js

@@ -151,7 +151,7 @@ JSClass("SKAMQPJobQueue", SKJobQueue, {
 
     enqueueDictionary: async function(dictionary){
         var json = JSON.stringify(dictionary);
-        var content = json.utf8();
+        var content = json.utf8().nodeBuffer();
         await this.channel.sendToQueue(this.identifier, content, {persistent: true, priority: dictionary.priority});
     },
 

package/Root/Frameworks/ServerKit/SKApplication+Node.js

@@ -54,18 +54,20 @@ SKApplication.definePropertiesFromExtensions({
                 var logs = JSLog.getRecords();
                 var promise = this.delegate.applicationDidCrash(this, error, logs);
                 if (promise instanceof Promise){
-                    promise.catch(function(error){
-                        logger.error("Error while handling crash: %{error}", error);
+                    promise.catch(function(e){
+                        logger.error("SKApplication crash: %{error}", error);
+                        logger.error("Error while handling crash: %{error}", e);
                     }).finally(stop);
                 }else{
                     stop();
                 }
             }catch (e){
+                logger.error("SKApplication crash: %{error}", error);
                 logger.error("Error while handling crash: %{error}", e);
                 stop();
             }
         }else{
-            logger.error(error);
+            logger.error("SKApplication crash: %{error}", error);
             stop();
         }
     }

package/Root/Frameworks/ServerKit/SKJobQueue.js

@@ -35,7 +35,7 @@ JSClass("SKJobQueue", JSObject, {
             return SKFileJobQueue.initWithURL(url, fileManager);
         }else if (url.scheme === "redis"){
             return SKRedisJobQueue.initWithURL(url, service);
-        }else if (url.scheme === "amqp"){
+        }else if (url.scheme === "amqp" || url.scheme === "amqps"){
             return SKAMQPJobQueue.initWithURL(url, service);
         }else if (url.scheme === "memory"){
             return SKMemoryJobQueue.init();

package/Root/Frameworks/ServerKit/SKRedisJobQueue.js

@@ -46,7 +46,7 @@ JSClass("SKRedisJobQueue", SKJobQueue, {
         if (this.openPromise === null){
             this.openPromise = new Promise(function(resolve, reject){
                 logger.info("Redis client connecting to %{public}:%d...", queue.url.host, queue.url.port || 6379);
-                var client = queue.redis.createClient({url: queue.url.encodedString});
+                var client = queue.redis.createClient({url: queue.url.encodedString, legacyMode: true});
                 var errorHandler = function(error){
                     logger.info("Failed to open Redis connection: %{error}", error);
                     queue.openPromise = null;
@@ -61,8 +61,12 @@ JSClass("SKRedisJobQueue", SKJobQueue, {
                     queue.client = client;
                     resolve();
                 };
-                client.on("error", errorHandler);
-                client.on("ready", readyHandler);
+                if (client.connect){
+                    client.connect().then(readyHandler, errorHandler);
+                }else{
+                    client.on("error", errorHandler);
+                    client.on("ready", readyHandler);
+                }
             });
         }
         return this.openPromise;

package/Root/Frameworks/ServerKitTesting/Info.yaml

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

package/Root/Frameworks/TestKit/Info.yaml

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

package/Root/Frameworks/TestKit/TKMock.js

@@ -1,4 +1,4 @@
-// // Copyright 2021 Breakside Inc.
+// Copyright 2021 Breakside Inc.
 //
 // Licensed under the Breakside Public License, Version 1.0 (the "License");
 // you may not use this file except in compliance with the License.

package/Root/Frameworks/UIKit/Info.yaml

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

package/Root/Frameworks/UIKit/UIBrowserViewController.js

@@ -87,8 +87,7 @@ JSClass("UIBrowserViewController", UIViewController, {
         this._viewControllers.push(viewController);
         this.view.pushView(viewController.view);
         if (this.isViewVisible){
-            viewController.viewWillAppear(false);
-            viewController.viewDidAppear(false);
+            viewController.scheduleAppearance();
         }
     },
 
@@ -102,13 +101,10 @@ JSClass("UIBrowserViewController", UIViewController, {
             vc = this._viewControllers.pop();
             --count;
             if (this.isViewVisible){
-                vc.viewWillDisappear(false);
+                vc.scheduleDisappearance();
             }
             this.view.popView();
             this.removeFromParentViewController(vc);
-            if (this.isViewVisible){
-                vc.viewDidDisappear(false);
-            }
         }
     }
 

package/Root/Frameworks/UIKit/UIHTMLApplication.js

@@ -190,7 +190,27 @@ JSClass("UIHTMLApplication", UIApplication, {
     },
 
     _crash: function(error){
-        logger.error(error);
+        if (this.delegate && this.delegate.applicationDidCrash){
+            try{
+                var logs = JSLog.getRecords();
+                var promise = this.delegate.applicationDidCrash(this, error, logs);
+                if (promise instanceof Promise){
+                    promise.catch(function(e){
+                        logger.error("UIApplication crash: %{error}", error);
+                        logger.error("Error while handling crash: %{error}", e);
+                    });
+                }
+            }catch (e){
+                logger.error("UIApplication crash: %{error}", error);
+                logger.error("Error while handling crash: %{error}", e);
+            }
+        }else{
+            logger.error("UIApplication crash: %{error}", error);
+        }
+        this._showCrashScreen();
+    },
+
+    _showCrashScreen: function(){
         this.windowServer.stop();
         var root = this.windowServer.displayServer.rootElement;
         var cover = root.appendChild(root.ownerDocument.createElement('div'));
@@ -201,10 +221,6 @@ JSClass("UIHTMLApplication", UIApplication, {
         cover.style.right = '0';
         cover.style.bottom = '0';
         var message;
-        if (this.delegate && this.delegate.applicationDidCrash){
-            var logs = JSLog.getRecords();
-            message = this.delegate.applicationDidCrash(this, error, logs);
-        }
         if (!message){
             message = "Sorry, there was a problem and the application needs to restart.\n\nPlease reload the page to continue.";
         }

package/Root/Frameworks/UIKit/UINavigationBar.js

@@ -303,6 +303,7 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
     contentSeparatorSize: 0,
     titleColor: null,
     titleTextAlignment: JSTextAlignment.center,
+    titleInsets: null,
     itemColor: null,
     activeItemColor: null,
     disabledItemColor: null,
@@ -347,6 +348,9 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         if (spec.containsKey("titleTextAlignment")){
             this.titleTextAlignment = spec.valueForKey("titleTextAlignment", JSTextAlignment);
         }
+        if (spec.containsKey("titleInsets")){
+            this.titleInsets = spec.valueForKey("titleInsets", JSInsets);
+        }
         if (spec.containsKey("itemColor")){
             this.itemColor = spec.valueForKey("itemColor", JSColor);
         }
@@ -702,10 +706,13 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
         var itemHeight = size.height - this.itemInsets.height;
         var y = this.itemInsets.top;
         var barItemView = props.backBarItemView;
+        var titleTextAlignment = item ? item.titleTextAlignment || this.titleTextAlignment : this.titleTextAlignment;
         barItemView.sizeToFitSize(JSSize(xRight - xLeft, itemHeight));
         barItemView.frame = JSRect(JSPoint(xLeft, y + (itemHeight - barItemView.bounds.size.height) / 2), barItemView.bounds.size);
         if (!barItemView.hidden){
             xLeft += barItemView.bounds.size.width;
+        }else if (props.leftBarItemViews.length === 0 && titleTextAlignment === JSTextAlignment.left && this.titleInsets !== null){
+            xLeft = this.titleInsets.left;
         }
         for (i = 0, l = props.leftBarItemViews.length; i < l; ++i){
             barItemView = props.leftBarItemViews[i];
@@ -738,7 +745,6 @@ JSClass("UINavigationBarDefaultStyler", UINavigationBarStyler, {
             var maxX = xRight - viewSize.width;
             var centeredX = (size.width - viewSize.width) / 2;
             var centeredY = (size.height - viewSize.height) / 2;
-            var titleTextAlignment = item ? item.titleTextAlignment || this.titleTextAlignment : this.titleTextAlignment;
             if (titleTextAlignment === JSTextAlignment.center){
                 titleView.frame = JSRect(JSPoint(Math.min(Math.max(minX, centeredX), maxX), centeredY), viewSize);
             }else if (titleTextAlignment === JSTextAlignment.right){