@breakside/jskit 2023.20.0 → 2023.21.0

package/Root/Frameworks/SecurityKit/SECCipher+HTML.js

@@ -195,14 +195,6 @@ SECCipherAESCounter.definePropertiesFromExtensions({
             counter: JSData.initWithLength(16),
             length: 64
         };
-        this.decryptedMessageId =
-              (nonce[6] << 48)
-            | (nonce[5] << 40)
-            | (nonce[4] << 32)
-            | (nonce[3] << 24)
-            | (nonce[2] << 16)
-            | (nonce[1] << 8)
-            | (nonce[0]);
         nonce.copyTo(algorithm.counter, 0);
         return algorithm;
     },
@@ -282,55 +274,41 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
 
     htmlAlgorithmName: HTMLCryptoAlgorithmNames.aesGCM,
 
-    _getHTMLEncryptAlgorithm: function(){
-        var nonce = JSData.initWithArray([
-            1,
-            ((this.encryptedMessageId / 0x100000000) >> 16) & 0xFF,
-            ((this.encryptedMessageId / 0x100000000) >> 8) & 0xFF,
-            (this.encryptedMessageId / 0x100000000) & 0xFF,
-            (this.encryptedMessageId >> 24) & 0xFF,
-            (this.encryptedMessageId >> 16) & 0xFF,
-            (this.encryptedMessageId >> 8) & 0xFF,
-            this.encryptedMessageId & 0xF
-        ]);
+    _getHTMLEncryptAlgorithm: function(nonce, _ivLength){
+        if (_ivLength === undefined){
+            _ivLength = nonce.length;
+        }
         var algorithm = {
             name: HTMLCryptoAlgorithmNames.aesGCM,
-            iv: JSData.initWithLength(16),
+            iv: JSData.initWithLength(_ivLength),
             tagLength: 128
         };
         nonce.copyTo(algorithm.iv, 0);
         return algorithm;
     },
 
-    _getHTMLDecryptAlgorithm: function(prefixedData){
-        var nonce = prefixedData.subdataInRange(JSRange(0, 8));
+    _getHTMLDecryptAlgorithm: function(prefixedData, nonceLength, _ivLength){
+        if (nonceLength === undefined){
+            nonceLength = 8;
+        }
+        if (_ivLength === undefined){
+            _ivLength = nonceLength;
+        }
+        var nonce = prefixedData.subdataInRange(JSRange(0, nonceLength));
         var algorithm = {
             name: HTMLCryptoAlgorithmNames.aesGCM,
-            iv: JSData.initWithLength(16),
+            iv: JSData.initWithLength(_ivLength),
             tagLength: 128
         };
-        this.decryptedMessageId =
-              (nonce[6] << 48)
-            | (nonce[5] << 40)
-            | (nonce[4] << 32)
-            | (nonce[3] << 24)
-            | (nonce[2] << 16)
-            | (nonce[1] << 8)
-            | (nonce[0]);
         nonce.copyTo(algorithm.iv, 0);
         return algorithm;
     },
 
-    encrypt: function(data, key, completion, target){
+    encryptWithNonce: function(nonce, data, key, completion, target, _ivLength){
         if (!completion){
             completion = Promise.completion(Promise.resolveNonNull);
         }
-        if (!this.ensureUniqueMessageID()){
-            JSRunLoop.main.schedule(completion, target, null);
-            return completion.promise;
-        }
-        var algorithm = this._getHTMLEncryptAlgorithm();
-        var nonce = algorithm.iv.truncatedToLength(8);
+        var algorithm = this._getHTMLEncryptAlgorithm(nonce, _ivLength);
         crypto.subtle.encrypt(algorithm, key.htmlKey, data).then(function(encrypted){
             var noncePrefixed = JSData.initWithChunks([nonce, JSData.initWithBuffer(encrypted)]);
             completion.call(target, noncePrefixed);
@@ -340,12 +318,12 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
         return completion.promise;
     },
 
-    decrypt: function(data, key, completion, target){
+    decryptWithNonceLength: function(nonceLength, data, key, completion, target, _ivLength){
         if (!completion){
             completion = Promise.completion(Promise.resolveNonNull);
         }
-        var algorithm = this._getHTMLDecryptAlgorithm(data);
-        var encrypted = data.subdataInRange(JSRange(8, data.length - 8));
+        var algorithm = this._getHTMLDecryptAlgorithm(data, nonceLength, _ivLength);
+        var encrypted = data.subdataInRange(JSRange(nonceLength, data.length - nonceLength));
         crypto.subtle.decrypt(algorithm, key.htmlKey, encrypted).then(function(decrypted){
             var decryptedData = JSData.initWithBuffer(decrypted);
             completion.call(target, decryptedData);
@@ -363,8 +341,17 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
             JSRunLoop.main.schedule(completion, target, null);
             return completion.promise;
         }
-        var algorithm = this._getHTMLEncryptAlgorithm();
-        var nonce = algorithm.iv.truncatedToLength(8);
+        var nonce = JSData.initWithArray([
+            1,
+            ((this.encryptedMessageId / 0x100000000) >> 16) & 0xFF,
+            ((this.encryptedMessageId / 0x100000000) >> 8) & 0xFF,
+            (this.encryptedMessageId / 0x100000000) & 0xFF,
+            (this.encryptedMessageId >> 24) & 0xFF,
+            (this.encryptedMessageId >> 16) & 0xFF,
+            (this.encryptedMessageId >> 8) & 0xFF,
+            this.encryptedMessageId & 0xF
+        ]);
+        var algorithm = this._getHTMLEncryptAlgorithm(nonce, 16);
         crypto.subtle.wrapKey("raw", key.htmlKey, wrappingKey.htmlKey, algorithm).then(function(bytes){
             var noncePrefixed = JSData.initWithChunks([nonce, JSData.initWithBuffer(bytes)]);
             completion.call(target, noncePrefixed);
@@ -378,7 +365,7 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
         if (!completion){
             completion = Promise.completion(Promise.resolveNonNull);
         }
-        var algorithm = this._getHTMLDecryptAlgorithm(wrappedKeyData);
+        var algorithm = this._getHTMLDecryptAlgorithm(wrappedKeyData, 8, 16);
         var unwrappedKeyHTMLAlgorithm = HTMLCryptoAlgorithmNames.fromAlgorithm(unwrappedKeyAlgorithm);
         wrappedKeyData = wrappedKeyData.subdataInRange(JSRange(8, wrappedKeyData.length - 8));
         crypto.subtle.unwrapKey("raw", wrappedKeyData, wrappingKey.htmlKey, algorithm, unwrappedKeyHTMLAlgorithm, true, ["encrypt", "decrypt"]).then(function(key){

package/Root/Frameworks/SecurityKit/SECCipher+Node.js

@@ -182,14 +182,6 @@ SECCipherAESCounter.definePropertiesFromExtensions({
                 return completion.promise;
             }
             var nonce = data.subdataInRange(JSRange(0, 8));
-            this.decryptedMessageId =
-                  (nonce[6] << 48)
-                | (nonce[5] << 40)
-                | (nonce[4] << 32)
-                | (nonce[3] << 24)
-                | (nonce[2] << 16)
-                | (nonce[1] << 8)
-                | (nonce[0]);
             var iv = JSData.initWithLength(16);
             nonce.copyTo(iv, 0);
             var cipher = crypto.createDecipheriv(name, key.keyData, iv);
@@ -217,41 +209,31 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
         return null;
     },
 
-    encrypt: function(data, key, completion, target){
+    encryptWithNonce: function(nonce, data, key, completion, target, _ivLength){
         if (!completion){
             completion = Promise.completion(Promise.resolveNonNull);
         }
-        if (!this.ensureUniqueMessageID()){
-            JSRunLoop.main.schedule(completion, target, null);
-            return completion.promise;
-        }
         var name = this._cipherNameForKey(key);
         if (name === null){
             JSRunLoop.main.schedule(completion, target, null);
             return completion.promise;
         }
-        var nonce = JSData.initWithArray([
-            1,
-            ((this.encryptedMessageId / 0x100000000) >> 16) & 0xFF,
-            ((this.encryptedMessageId / 0x100000000) >> 8) & 0xFF,
-            (this.encryptedMessageId / 0x100000000) & 0xFF,
-            (this.encryptedMessageId >> 24) & 0xFF,
-            (this.encryptedMessageId >> 16) & 0xFF,
-            (this.encryptedMessageId >> 8) & 0xFF,
-            this.encryptedMessageId & 0xF
-        ]);
-        var iv = JSData.initWithLength(16);
+        if (_ivLength === undefined){
+            _ivLength = nonce.length;
+        }
+        var iv = JSData.initWithLength(_ivLength);
         nonce.copyTo(iv, 0);
         var cipher = crypto.createCipheriv(name, key.keyData, iv);
         var chunks = [nonce, cipher.update(data), cipher.final()];
-        var tag = JSData.initWithLength(16);
+        var tagLength = 16;
+        var tag = JSData.initWithLength(tagLength);
         cipher.getAuthTag().copyTo(tag, 0);
         chunks.push(tag);
         JSRunLoop.main.schedule(completion, target, JSData.initWithChunks(chunks));
         return completion.promise;
     },
 
-    decrypt: function(data, key, completion, target){
+    decryptWithNonceLength: function(nonceLength, data, key, completion, target, _ivLength){
         if (!completion){
             completion = Promise.completion(Promise.resolveNonNull);
         }
@@ -261,21 +243,17 @@ SECCipherAESGaloisCounterMode.definePropertiesFromExtensions({
                 JSRunLoop.main.schedule(completion, target, null);
                 return completion.promise;
             }
-            var nonce = data.subdataInRange(JSRange(0, 8));
-            this.decryptedMessageId =
-                  (nonce[6] << 48)
-                | (nonce[5] << 40)
-                | (nonce[4] << 32)
-                | (nonce[3] << 24)
-                | (nonce[2] << 16)
-                | (nonce[1] << 8)
-                | (nonce[0]);
-            var iv = JSData.initWithLength(16);
+            var nonce = data.subdataInRange(JSRange(0, nonceLength));
+            if (_ivLength === undefined){
+                _ivLength = nonceLength;
+            }
+            var iv = JSData.initWithLength(_ivLength);
             nonce.copyTo(iv, 0);
             var cipher = crypto.createDecipheriv(name, key.keyData, iv);
-            var tag = data.subdataInRange(JSRange(data.length - 16, 16));
+            var tagLength = 16;
+            var tag = data.subdataInRange(JSRange(data.length - tagLength, tagLength));
             cipher.setAuthTag(tag);
-            var chunks = [cipher.update(data.subdataInRange(JSRange(8, data.length - 8 - 16))), cipher.final()];
+            var chunks = [cipher.update(data.subdataInRange(JSRange(nonceLength, data.length - nonceLength - tagLength))), cipher.final()];
             JSRunLoop.main.schedule(completion, target, JSData.initWithChunks(chunks));
         }catch(e){
             JSRunLoop.main.schedule(completion, target, null);

package/Root/Frameworks/SecurityKit/SECCipher.js

@@ -190,7 +190,6 @@ JSClass("SECCipherAESCipherBlockChaining", SECCipher, {
 JSClass("SECCipherAESCounter", SECCipher, {
 
     encryptedMessageId: 0,
-    decryptedMessageId: 0,
 
     ensureUniqueMessageID: function(){
         if (this.encryptedMessageId == 9007199254740991){
@@ -205,7 +204,6 @@ JSClass("SECCipherAESCounter", SECCipher, {
 JSClass("SECCipherAESGaloisCounterMode", SECCipher, {
 
     encryptedMessageId: 0,
-    decryptedMessageId: 0,
 
     ensureUniqueMessageID: function(){
         if (this.encryptedMessageId == 9007199254740991){
@@ -213,7 +211,39 @@ JSClass("SECCipherAESGaloisCounterMode", SECCipher, {
         }
         ++this.encryptedMessageId;
         return true;
-    }
+    },
+
+    encrypt: function(data, key, completion, target){
+        if (!completion){
+            completion = Promise.completion(Promise.resolveNonNull);
+        }
+        if (!this.ensureUniqueMessageID()){
+            JSRunLoop.main.schedule(completion, target, null);
+            return completion.promise;
+        }
+        var nonce = JSData.initWithArray([
+            1,
+            ((this.encryptedMessageId / 0x100000000) >> 16) & 0xFF,
+            ((this.encryptedMessageId / 0x100000000) >> 8) & 0xFF,
+            (this.encryptedMessageId / 0x100000000) & 0xFF,
+            (this.encryptedMessageId >> 24) & 0xFF,
+            (this.encryptedMessageId >> 16) & 0xFF,
+            (this.encryptedMessageId >> 8) & 0xFF,
+            this.encryptedMessageId & 0xF
+        ]);
+        this.encryptWithNonce(nonce, data, key, completion, target, 16);
+        return completion.promise;
+    },
+
+    decrypt: function(data, key, completion, target){
+        return this.decryptWithNonceLength(8, data, key, completion, target, 16);
+    },
+
+    encryptWithNonce: function(nonce, data, key, completion, target){
+    },
+
+    decryptWithNonceLength: function(nonceLength, data, key, completion, target){
+    },
 
 });
 

package/Root/Frameworks/SecurityKit/SECHMAC.js

@@ -64,4 +64,21 @@ SECHMAC.Algorithm = {
     sha256: "sha256",
     sha384: "sha384",
     sha512: "sha512"
+};
+
+SECHMAC.digest = function(algorithm, keyData, data, completion, target){
+    if (!completion){
+        completion = Promise.completion(Promise.resolveNonNull);
+    }
+    var hmac = SECHMAC.initWithAlgorithm(algorithm);
+    hmac.createKeyWithData(keyData, function(key){
+        if (key === null){
+            completion.call(target, null);
+            return;
+        }
+        hmac.key = key;
+        hmac.update(data);
+        hmac.sign(completion, target);
+    });
+    return completion.promise;
 };

package/Root/Frameworks/ServerKit/Info.yaml

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

package/Root/Frameworks/ServerKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKitTesting
-JSBundleVersion: 2023.20.0
+JSBundleVersion: 2023.21.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: 2023.20.0
+JSBundleVersion: 2023.21.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/UIKit/Info.yaml

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

package/Root/Frameworks/UIKit/UIHTMLContentEditableTextInputManager.js

@@ -57,8 +57,8 @@ JSClass('UIHTMLContentEditableTextInputManager', UITextInputManager, {
             this.textInputLayer = null;
             this.layoutManager = null;
         }else{
-            this.textInputLayer = this.textInputClient.textInputLayer ? this.textInputClient.textInputLayer() : null;
             this.layoutManager = this.textInputClient.textInputLayoutManager ? this.textInputClient.textInputLayoutManager() : null;
+            this.textInputLayer = this.textInputClient.textInputLayer ? this.textInputClient.textInputLayer() : null;
         }
     },
 

package/Root/Frameworks/UIKit/UIHTMLWindowServer.js

@@ -401,6 +401,13 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
                         preventDefault = false;
                     }
                     break;
+                case 81: // q
+                    if (modifiers === UIPlatform.shared.commandModifier){
+                        // We want to let the quit shortcut go through, so it can be
+                        // handled by the system.
+                        preventDefault = false;
+                    }
+                    break;
                 case 88: // x
                     if (modifiers === UIPlatform.shared.commandModifier){
                         // We want to let the cut keyboard shortcut go through, so it can be
@@ -957,7 +964,7 @@ JSClass("UIHTMLWindowServer", UIWindowServer, {
     layoutWindow: function(window){
         UIHTMLWindowServer.$super.layoutWindow.call(this, window);
         if (window instanceof UIRootWindow){
-            window.contentInsets = this.safeAreaInsets();
+            window.contentInsets = window.contentInsets.insetsWithInsets(this.safeAreaInsets());
         }
     },
 

package/Root/Frameworks/UIKit/UIWindowServer.js

@@ -165,9 +165,6 @@ JSClass("UIWindowServer", JSObject, {
         if (this._normalLevelRange.location === 0 && window.level === UIWindow.Level.normal){
             window.level = UIWindow.Level.back;
         }
-        if (this._normalLevelRange.location === 0 && window.level == UIWindow.Level.back){
-            this.updateRootWindowInsets(window);
-        }
         this._beginWindowOrderChange();
         this._windowsById[window.objectID] = window;
         switch (window.level){
@@ -278,8 +275,13 @@ JSClass("UIWindowServer", JSObject, {
     },
 
     layoutWindow: function(window){
-        if (window.level === UIWindow.Level.back){
+        if (window instanceof UIRootWindow){
             window.frame = window._screen.frame;
+            var insets = JSInsets.Zero;
+            if (this._menuBar !== null && this._menuBar.isOpaque){
+                insets.top = this._menuBar.frame.size.height;
+            }
+            window.contentInsets = insets;
         }else{
             // TODO: make sure nothing has moved off screen
         }
@@ -293,14 +295,6 @@ JSClass("UIWindowServer", JSObject, {
         this.screen.availableInsets = insets;
     },
 
-    updateRootWindowInsets: function(rootWindow){
-        var insets = JSInsets.Zero;
-        if (this._menuBar !== null && this._menuBar.isOpaque){
-            insets.top = this._menuBar.frame.size.height;
-            rootWindow.contentInsets = insets;
-        }
-    },
-
     // -----------------------------------------------------------------------
     // MARK: - Text Input Coordination
 
@@ -346,7 +340,7 @@ JSClass("UIWindowServer", JSObject, {
         }
         this.updateScreenAvailableInsets();
         if (this.windowStack.length > 0 && this._normalLevelRange.location > 0){
-            this.updateRootWindowInsets(this.windowStack[0]);
+            this.layoutWindow(this.windowStack[0]);
         }
     },
 

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/Root/Templates/html/${PROJECT_NAME}/www/${PROJECT_NAME}.webmanifest

@@ -0,0 +1,9 @@
+{
+    "lang": "en",
+    "name": "${PROJECT_NAME}",
+    "short_name": "${PROJECT_NAME}",
+    "scope": "/",
+    "start_url": "/",
+    "display": "standalone",
+    "shortcuts": []
+}

package/Root/Templates/html/${PROJECT_NAME}/www/HTMLAppBootstrapper.js

@@ -222,6 +222,8 @@ HTMLAppBootstrapper.prototype = {
         this.setStatus(HTMLAppBootstrapper.STATUS.appCrashed);
     },
 
+    scriptContainerElement: null,
+
     include: function(src, async, callback, errorCallback){
         try{
             this.loadingScripts[src] = {
@@ -244,7 +246,11 @@ HTMLAppBootstrapper.prototype = {
                 errorCallback(new Error("Include of '" + src + "' failed"));
             });
             script.src = src;
-            this.rootElement.ownerDocument.body.appendChild(script);
+            if (this.scriptContainerElement === null){
+                this.scriptContainerElement = this.rootElement.appendChild(this.rootElement.ownerDocument.createElement("div"));
+                this.scriptContainerElement.style.display = "none";
+            }
+            this.scriptContainerElement.appendChild(script);
         }catch (e){
             errorCallback(e);
         }

package/Root/Templates/html/${PROJECT_NAME}/www/index.html

@@ -2,6 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
+  <link rel="manifest" href="${PROJECT_NAME}.webmanifest">
   <meta name="viewport" content="initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover">
   <meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
   <meta name="theme-color" media="(prefers-color-scheme: dark)" content="rgb(38,38,38)">

package/Root/Templates/html/${PROJECT_NAME}/www/service-worker.js

@@ -166,4 +166,28 @@ self.addEventListener('message', function(event){
     console.log('Client message to activate ' + cacheKey);
     self.skipWaiting();
   }
-});
+});
+
+// Push notification handling example:
+//
+// self.addEventListener('push', function(event){
+//   let message = event.data.json();
+//   console.log("received push message", message);
+//   if (message.type === "notification"){
+//     if (!self.Notification){
+//       console.warn("notifications not available");
+//     }
+//     if (self.Notification.permission !== "granted"){
+//       console.warn("notifications permission not granted");
+//     }
+//     var options = {
+//     };
+//     if (message.identifier){
+//       options.tag = message.identifier;
+//     }
+//     if (message.body !== null && message.body !== undefined){
+//         options.body = message.body;
+//     }
+//     self.registration.showNotification(message.title, options);
+//   }
+// });

package/package.json

@@ -9,7 +9,7 @@
     "node": ">=10.10.0"
   },
   "name": "@breakside/jskit",
-  "version": "2023.20.0",
+  "version": "2023.21.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "files": [
     "*"