@breakside/jskit 2023.19.0 → 2023.21.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2023.19.0",
+  "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+  "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
 }

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": "2023.19.0",
+    "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+    "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2023.19.0",
+  "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+  "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
 }

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": "2023.19.0",
+    "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+    "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2023.19.0",
+  "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+  "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
 }

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

@@ -175,7 +175,7 @@ JSURLResponse.error = function(statusCode, object){
 
 JSGlobalObject.JSURLResponseError = function(response){
     if (this === undefined){
-        return new JSURLResponseError();
+        return new JSURLResponseError(response);
     }
     this.name = "JSURLResponseError";
     if (response instanceof JSURLResponseError){

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": "2023.19.0",
+    "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+    "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
   },
   "Resources": [
     {

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2023.19.0",
+  "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+  "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
 }

package/Frameworks/SecurityKit.jsframework/JS/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/Frameworks/SecurityKit.jsframework/JS/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/Frameworks/SecurityKit.jsframework/JS/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/Frameworks/SecurityKit.jsframework/JS/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/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": "2023.19.0",
+    "JSBundleVersion": "2023.21.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": "1dc0150a5a81da24491bad16f195a3683e48f654"
+    "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
   },
   "Resources": [],
   "ResourceLookup": {

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2023.19.0",
+  "JSBundleVersion": "2023.21.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "1dc0150a5a81da24491bad16f195a3683e48f654"
+  "GitRevision": "af89e2c41e4ddad1c493c9ccfd577f76dde0520b"
 }

package/Node/HTMLBuilder.js

@@ -484,7 +484,8 @@ JSClass("HTMLBuilder", Builder, {
     wwwCSSPaths:  null,
     wwwPaths: null,
     uncachedWWWPaths: null,
-    manifestURL: null,
+    webApplicationManifestURL: null,
+    legacyAppcacheManifestURL: null,
     preflightId: null,
     preflightURL: null,
     preflightFeatures: null,
@@ -497,14 +498,14 @@ JSClass("HTMLBuilder", Builder, {
         // As of Dec 2019...
         // Browsers are in the process of removing the appcache API soon (Chrome
         // says it'll be gone by April 2020), so there's no point to contunue
-        // supporting it.  Keeping this `manifestURL` `null` will disable the
+        // supporting it.  Keeping this `legacyAppcacheManifestURL` `null` will disable the
         // appcache behavior in the built application, but has the advantage of
         // keeping our builder code otherwise as-is should we need to reference
         // it or turn it back on (like for IE 11 support).  The way we use
         // service workers (the appcache replacement API) is to essentially
         // mimic the way appcache worked because although others didn't like it,
         // appcache was perfect for our use case.
-        // this.manifestURL = this.wwwURL.appendingPathComponent("manifest.appcache");
+        // this.legacyAppcacheManifestURL = this.wwwURL.appendingPathComponent("manifest.appcache");
 
         await this.buildCSS();
         await this.buildPreflight();
@@ -552,7 +553,8 @@ JSClass("HTMLBuilder", Builder, {
             }
         }
 
-        await this.buildManifest();
+        await this.buildLegacyAppcacheManifest();
+        await this.updateWebApplicationManifest();
     },
 
     _copyWWWEntry: async function(entry, wwwPath, manifestConfiguration){
@@ -612,6 +614,11 @@ JSClass("HTMLBuilder", Builder, {
             }else if (element.localName == 'title' && element.parentNode.localName == 'head'){
                 let title = this.project.getInfoString('UIApplicationTitle', this.resources);
                 element.appendChild(document.createTextNode(title));
+            }else if (element.localName == 'link' && element.parentNode.localName == 'head' && element.getAttribute("rel") == "manifest"){
+                let href = element.getAttribute("href");
+                if (href !== "" && href !== null){
+                    this.webApplicationManifestURL = JSURL.initWithString(href, toURL);
+                }
             }else if (element.localName == 'script' && element.getAttribute('type') == 'text/javascript'){
                 if (element.hasAttribute("jskit")){
                     let params = {
@@ -653,8 +660,8 @@ JSClass("HTMLBuilder", Builder, {
                 }
             }
         }
-        if (this.manifestURL){
-            document.documentElement.setAttribute('manifest', this.manifestURL.encodedStringRelativeTo(this.wwwURL));
+        if (this.legacyAppcacheManifestURL){
+            document.documentElement.setAttribute('manifest', this.legacyAppcacheManifestURL.encodedStringRelativeTo(this.wwwURL));
         }
         let serializer = new XMLSerializer();
         html = serializer.serializeToString(document);
@@ -785,8 +792,24 @@ JSClass("HTMLBuilder", Builder, {
         await this.fileManager.createFileAtURL(this.preflightURL, contents);
     },
 
-    buildManifest: async function(){
-        if (!this.manifestURL){
+    updateWebApplicationManifest: async function(){
+        if (!this.webApplicationManifestURL){
+            return;
+        }
+        let data = await this.fileManager.contentsAtURL(this.webApplicationManifestURL);
+        let manifest = JSON.parse(data.stringByDecodingUTF8());
+        if (!manifest.name){
+            manifest.name = this.project.getInfoString('UIApplicationTitle', this.resources);
+        }
+        if (!manifest.icons){
+            manifest.icons = this.manifestIcons();
+        }
+        data = JSON.stringify(manifest).utf8();
+        await this.fileManager.createFileAtURL(this.webApplicationManifestURL, data);
+    },
+
+    buildLegacyAppcacheManifest: async function(){
+        if (!this.legacyAppcacheManifestURL){
             return;
         }
         this.printer.setStatus("Creating manifest.appcache...");
@@ -827,7 +850,7 @@ JSClass("HTMLBuilder", Builder, {
         lines.push("*");
         lines.push("");
         let txt = lines.join("\n");
-        await this.fileManager.createFileAtURL(this.manifestURL, txt.utf8());
+        await this.fileManager.createFileAtURL(this.legacyAppcacheManifestURL, txt.utf8());
     },
 
     applicationIcons: function(){
@@ -840,15 +863,48 @@ JSClass("HTMLBuilder", Builder, {
             let images = contents.images;
             for (let i = 0, l = images.length; i < l; ++i){
                 let image = images[i];
-                let metadata = this.resources.getMetadata(image.filename, setName);
-                let bundledURL = this.resourcesURL.appendingPathComponent(metadata.hash + metadata.ext);
-                icons.push({
-                    rel: image.mask ? "mask-icon" : "icon",
-                    href: bundledURL.encodedStringRelativeTo(this.wwwURL),
-                    type: metadata.mimetype,
-                    sizes: image.vector ? "any" : '%dx%d'.sprintf(metadata.image.width, metadata.image.height),
-                    color: image.color || null
-                });
+                if (image.use === undefined || image.use === "web-icon" || image.use == "app-icon-base"){
+                    let metadata = this.resources.getMetadata(image.filename, setName);
+                    let bundledURL = this.resourcesURL.appendingPathComponent(metadata.hash + metadata.ext);
+                    let rel = "icon";
+                    if (image.use === "app-icon-base"){
+                        rel = "apple-touch-icon";
+                    }else if (image.mask){
+                        rel = "mask-icon";
+                    }
+                    icons.push({
+                        rel: rel,
+                        href: bundledURL.encodedStringRelativeTo(this.wwwURL),
+                        type: metadata.mimetype,
+                        sizes: (image.vector || metadata.image.vector) ? "any" : '%dx%d'.sprintf(metadata.image.width, metadata.image.height),
+                        color: image.color || null
+                    });
+                }
+            }
+        }
+        return icons;
+    },
+
+    manifestIcons: function(){
+        var icons = [];
+        let setName = this.project.info.UIApplicationIcon;
+        if (setName){
+            setName += '.imageset';
+            let metadata = this.resources.getMetadata('Contents.json', setName);
+            let contents = metadata.value;
+            let images = contents.images;
+            for (let i = 0, l = images.length; i < l; ++i){
+                let image = images[i];
+                if (image.use === "app-icon" || image.use === "app-icon-base"){
+                    let metadata = this.resources.getMetadata(image.filename, setName);
+                    let bundledURL = this.resourcesURL.appendingPathComponent(metadata.hash + metadata.ext);
+                    icons.push({
+                        src: bundledURL.encodedStringRelativeTo(this.wwwURL),
+                        type: metadata.mimetype,
+                        sizes: metadata.image.vector ? "any" : '%dx%d'.sprintf(metadata.image.width, metadata.image.height),
+                        purpose: image.use === "app-icon-base" ? "maskable" : "any"
+                    });
+                }
             }
         }
         return icons;
@@ -948,8 +1004,8 @@ JSClass("HTMLBuilder", Builder, {
             indexPath,
             bootstrapperPath
         ];
-        if (this.manifestURL !== null){
-            manifestPath = this.manifestURL.encodedStringRelativeTo(this.wwwURL);
+        if (this.legacyAppcacheManifestURL !== null){
+            manifestPath = this.legacyAppcacheManifestURL.encodedStringRelativeTo(this.wwwURL);
             excludes.push(manifestPath);
         }
         if (this.serviceWorkerURL !== null){