@breakside/jskit 2024.40.0 → 2024.41.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2024.40.0",
+  "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+  "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
 }

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": "2024.40.0",
+    "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+    "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2024.40.0",
+  "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+  "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
 }

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": "2024.40.0",
+    "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+    "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2024.40.0",
+  "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+  "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
 }

package/Frameworks/Foundation.jsframework/JS/Foundation+HTML.js

@@ -34,4 +34,6 @@
 
 // Subclasses
 // #import "JSHTMLFile.js"
-// #import "JSHTMLFileEnumerator.js"
+// #import "JSHTMLFileEnumerator.js"
+
+// #import "JSHTMLUserAgent.js"

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

@@ -0,0 +1,130 @@
+// 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.
+// If a copy of the License was not distributed with this file, you may
+// obtain a copy at
+//
+//     http://breakside.io/licenses/LICENSE-1.0.txt
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// #import "JSObject.js"
+"use strict";
+
+JSClass("JSHTMLUserAgent", JSObject, {
+
+    string: null,
+    products: null,
+    productsByIdentifier: null,
+    comments: null,
+    commentSet: null,
+
+    initWithString: function(string){
+        if (string === null || string === undefined){
+            return null;
+        }
+        this.string = string;
+        this.products = [];
+        this.productsByIdentifier = new Set();
+        this.comments = [];
+        this.commentSet = new Set();
+        this.parse();
+    },
+
+    parse: function(){
+        var str = this.string;
+        var i = 0;
+        var l = this.string.length;
+        var product = "";
+        var version = "";
+        var comment = "";
+        while (i < l){
+            while (str[i] == " " || str[i] == "\t"){
+                ++i;
+            }
+            if (i < l){
+                if (str[i] == "("){
+                    comment = "";
+                    ++i;
+                    while (i < l && str[i] !== ")"){
+                        if (str[i] == ";"){
+                            comment = comment.trim();
+                            if (comment !== ""){
+                                this.addComment(comment);
+                            }
+                            comment = "";
+                        }else{
+                            comment += str[i];
+                        }
+                        ++i;
+                    }
+                    comment = comment.trim();
+                    if (comment !== ""){
+                        this.addComment(comment);
+                    }
+                    if (i < l){
+                        ++i;
+                    }
+                }else{
+                    product = "";
+                    version = "";
+                    while (i < l && str[i] !== "/" && str[i] !== " " && str[i] !== "\t"){
+                        product += str[i];
+                        ++i;
+                    }
+                    if (i < l && str[i] == "/"){
+                        ++i;
+                        while (i < l && str[i] !== "(" && str[i] !== " " && str[i] !== "\t"){
+                            version += str[i];
+                            ++i;
+                        }
+                    }
+                    this.addProduct(product, version);
+                }
+            }
+        }
+    },
+
+    addProduct: function(name, version){
+        if (version === "" || version === undefined){
+            version = null;
+        }
+        var product = {name: name, version: version};
+        this.products.push(product);
+        this.productsByIdentifier[name] = product;
+        if (version !== null){
+            this.productsByIdentifier["%s/%s".sprintf(name, version)] = product;
+        }
+    },
+
+    addComment: function(comment){
+        this.comments.push(comment);
+        this.commentSet.add(comment);
+    },
+
+    containsProduct: function(name, version){
+        if (version === undefined || version === null || version === ""){
+            return name in this.productsByIdentifier;
+        }
+        return "%s/%s".sprintf(name, version) in this.productsByIdentifier;
+    },
+
+    versionOfProduct: function(name){
+        var product = this.productsByIdentifier[name];
+        if (product){
+            return product.version;
+        }
+        return null;
+    },
+
+    containsComment: function(comment){
+        return this.commentSet.has(comment);
+    }
+
+});
+

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": "2024.40.0",
+    "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+    "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
   },
   "Resources": [
     {

package/Frameworks/Foundation.jsframework/sources.json

@@ -295,6 +295,7 @@
       "JSFile+HTML.js",
       "JSHTMLFile.js",
       "JSHTMLFileEnumerator.js",
+      "JSHTMLUserAgent.js",
       "Foundation+HTML.js"
     ],
     "features": [
@@ -316,7 +317,8 @@
       "JSHTMLFileManager",
       "JSHTMLFile",
       "JSHTMLFileListFileEnumerator",
-      "JSHTMLFileSystemEntryFileEnumerator"
+      "JSHTMLFileSystemEntryFileEnumerator",
+      "JSHTMLUserAgent"
     ]
   },
   "node": {

package/Frameworks/SecurityKit.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
-  "JSBundleVersion": "2024.40.0",
+  "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+  "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
 }

package/Frameworks/SecurityKit.jsframework/JS/SECCBOR.js

@@ -44,6 +44,9 @@ JSClass("SECCBORParser", JSObject, {
     },
 
     readNext: function(){
+        if (this.offset >= this.data.length){
+            return null;
+        }
         var b = this.data[this.offset++];
         var info = b & 0x1F;
         var majorType = (b & 0xE0) >> 5;
@@ -65,6 +68,7 @@ JSClass("SECCBORParser", JSObject, {
             case SECCBOR.MajorType.other:
                 return this.readOther(info);
         }
+        return null;
     },
 
     readUnsignedInteger: function(info){

package/Frameworks/SecurityKit.jsframework/JS/SECHTMLDeviceAuthentication.js

@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// #import Foundation
 // #import "SECDeviceAuthentication.js"
 // #import "SECCipher.js"
 // #import "SECSign.js"
@@ -99,21 +100,19 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
             challenge: registration.challengeData,
             pubKeyCredParams: [],
             authenticatorSelection: {
-                // Browser support for resident keys is spotty:
-                // - Chrome works, requiring the user to set a PIN, but can't share with others
-                // - Safari works, no PIN required, but can't share with others
-                // - Safari will get PIN support in Safari 14
-                // - Firefox doesn't work on macOS, but supposedly works on windows with a PIN
-                // Without a resident key, we need something like a username that the user can
-                // provide so we can lookup allowed key IDs on a server and send them back to
-                // the client before authenticating
-                requireResidentKey: false,
-                residentKey: "discouraged",
+                // requiring a resident key is necessary for Android to
+                // actually save a passkey.  Apple OSes will save a passkey
+                // regardless of resident key settings
+                requireResidentKey: registration.platform ? true : false,
+                residentKey: registration.platform ? "required" : "discouraged",
                 userVerification: registration.platform && !registration.conditional ? "required" : "discouraged",
                 authenticatorAttachment: registration.platform ? "platform" : "cross-platform"
             },
             attestation: "none",
-            timeout: 10000
+            timeout: 60000,
+            extensions: {
+                credProps: true
+            }
         };
         if (registration.domain !== undefined){
             info.rp.id = registration.domain;
@@ -141,6 +140,7 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
             var jwk = credential.response.getPublicJWK();
             var webauthn = credential.toJSON();
             var result = {
+                name: credential.jskitName,
                 jwk: jwk,
                 challenge: registration.challengeData,
                 webauthn: webauthn
@@ -187,9 +187,9 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
         }
         var info = {
             challenge: request.challengeData,
-            userVerification: "discouraged",
-            timeout: 10000,
-            allowCredentials: []
+            userVerification: request.platform ? "required" : "discouraged",
+            timeout: 60000,
+            allowCredentials: [],
         };
         if (request.domain){
             info.rpId = request.domain;
@@ -207,7 +207,7 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
                         id: request.allowedKeyIDs[i].dataByDecodingBase64URL()
                     };
                     if (request.platform){
-                        allowedCredential.transports = ["internal"];
+                        allowedCredential.transports = ["internal", "hybrid"];
                     }
                     info.allowCredentials.push(allowedCredential);
                 }catch (e){
@@ -265,12 +265,65 @@ if (window.PublicKeyCredential){
             dictionary.rawId = JSData.initWithBuffer(this.rawId).base64URLStringRepresentation();
             dictionary.authenticatorAttachment = this.authenticatorAttachment || "";
             dictionary.type = this.type || "public-key";
-            dictionary.clientExtensionResults = this.getClientExtensionResults ? this.getClientExtensionResults() : {};
+            dictionary.clientExtensionResults = this.getClientExtensionResults();
             dictionary.response = this.response.toJSON ? this.response.toJSON() : {};
             return dictionary;
         };
     }
 
+    if (!window.PublicKeyCredential.prototype.getClientExtensionResults){
+        window.PublicKeyCredential.prototype.getClientExtensionResults = function PublicKeyCredential_getClientExtensionResults(){
+            if (this._clientExtensionResults === undefined){
+                var authData = JSData.initWithBuffer(this.getAuthenticatorData());
+                var idLength = (authData[53] << 8) | authData[54];
+                var offset = 55 + idLength;
+                var cbor = SECCBORParser.initWithData(authData.subdataInRange(JSRange(offset, authData.length - offset)));
+                var coseKey = cbor.readNext(); // ingored, only reading to arrive at the extensions start location
+                this._clientExtensionResults = cbor.readNext() || {};
+            }
+            return this._clientExtensionResults;
+        };
+    }
+
+    Object.defineProperties(window.PublicKeyCredential.prototype, {
+        jskitName: {
+            enumerable: false,
+            configurable: false,
+            get: function PublicKeyCredential_getJSKitName(){
+                var extensions = this.getClientExtensionResults();
+                if (extensions.credProps){
+                    if (extensions.credProps.authenticatorDisplayName){
+                        return extensions.credProps.authenticatorDisplayName;
+                    }
+                }
+                var ua = JSHTMLUserAgent.initWithString(navigator.userAgent);
+                var apple = ua.containsComment("Macintosh") || ua.containsComment("iPhone") || ua.containsComment("iPad");
+                var windows = ua.containsComment("Win64") || ua.containsComment("Windows NT 10.0");
+                var linux = ua.containsComment("Linux");
+                var android = false;
+                if (linux){
+                    var i, l;
+                    for (i = 0, l = ua.comments.length; i < l; ++i){
+                        if (ua.comments[i].startsWith("Android")){
+                            android = true;
+                            break;
+                        }
+                    }
+                }
+                if (apple){
+                    return "iCloud Keychain";
+                }
+                if (android){
+                    return "Google Password Manager";
+                }
+                if (windows){
+                    return "Windows Hello";
+                }
+                return "";
+            }
+        }
+    });
+
 }
 
 if (window.AuthenticatorAttestationResponse){

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": "2024.40.0",
+    "JSBundleVersion": "2024.41.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": "f17cafe60642c3c9674095789dec1d1803b72586"
+    "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
   },
   "Resources": [],
   "ResourceLookup": {

package/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "node",
   "JSBundleIdentifier": "io.breakside.jskit",
-  "JSBundleVersion": "2024.40.0",
+  "JSBundleVersion": "2024.41.0",
   "JSExecutableName": "jskit",
   "NPMOrganization": "breakside",
   "JSResources": [
     "Tests/HTMLTestRunner.js",
     "Tests/NodeTestRunner.js"
   ],
-  "GitRevision": "f17cafe60642c3c9674095789dec1d1803b72586"
+  "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
 }

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

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2024.40.0",
+    "JSBundleVersion": "2024.41.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "f17cafe60642c3c9674095789dec1d1803b72586"
+    "GitRevision": "bf643e90b060044223efa5a59f0d727332802563"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.APIKit
-JSBundleVersion: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/DBKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.DBKit
-JSBundleVersion: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/Foundation/Foundation+HTML.js

@@ -34,4 +34,6 @@
 
 // Subclasses
 // #import "JSHTMLFile.js"
-// #import "JSHTMLFileEnumerator.js"
+// #import "JSHTMLFileEnumerator.js"
+
+// #import "JSHTMLUserAgent.js"

package/Root/Frameworks/Foundation/Info.yaml

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

package/Root/Frameworks/Foundation/JSHTMLUserAgent.js

@@ -0,0 +1,130 @@
+// 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.
+// If a copy of the License was not distributed with this file, you may
+// obtain a copy at
+//
+//     http://breakside.io/licenses/LICENSE-1.0.txt
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// #import "JSObject.js"
+"use strict";
+
+JSClass("JSHTMLUserAgent", JSObject, {
+
+    string: null,
+    products: null,
+    productsByIdentifier: null,
+    comments: null,
+    commentSet: null,
+
+    initWithString: function(string){
+        if (string === null || string === undefined){
+            return null;
+        }
+        this.string = string;
+        this.products = [];
+        this.productsByIdentifier = new Set();
+        this.comments = [];
+        this.commentSet = new Set();
+        this.parse();
+    },
+
+    parse: function(){
+        var str = this.string;
+        var i = 0;
+        var l = this.string.length;
+        var product = "";
+        var version = "";
+        var comment = "";
+        while (i < l){
+            while (str[i] == " " || str[i] == "\t"){
+                ++i;
+            }
+            if (i < l){
+                if (str[i] == "("){
+                    comment = "";
+                    ++i;
+                    while (i < l && str[i] !== ")"){
+                        if (str[i] == ";"){
+                            comment = comment.trim();
+                            if (comment !== ""){
+                                this.addComment(comment);
+                            }
+                            comment = "";
+                        }else{
+                            comment += str[i];
+                        }
+                        ++i;
+                    }
+                    comment = comment.trim();
+                    if (comment !== ""){
+                        this.addComment(comment);
+                    }
+                    if (i < l){
+                        ++i;
+                    }
+                }else{
+                    product = "";
+                    version = "";
+                    while (i < l && str[i] !== "/" && str[i] !== " " && str[i] !== "\t"){
+                        product += str[i];
+                        ++i;
+                    }
+                    if (i < l && str[i] == "/"){
+                        ++i;
+                        while (i < l && str[i] !== "(" && str[i] !== " " && str[i] !== "\t"){
+                            version += str[i];
+                            ++i;
+                        }
+                    }
+                    this.addProduct(product, version);
+                }
+            }
+        }
+    },
+
+    addProduct: function(name, version){
+        if (version === "" || version === undefined){
+            version = null;
+        }
+        var product = {name: name, version: version};
+        this.products.push(product);
+        this.productsByIdentifier[name] = product;
+        if (version !== null){
+            this.productsByIdentifier["%s/%s".sprintf(name, version)] = product;
+        }
+    },
+
+    addComment: function(comment){
+        this.comments.push(comment);
+        this.commentSet.add(comment);
+    },
+
+    containsProduct: function(name, version){
+        if (version === undefined || version === null || version === ""){
+            return name in this.productsByIdentifier;
+        }
+        return "%s/%s".sprintf(name, version) in this.productsByIdentifier;
+    },
+
+    versionOfProduct: function(name){
+        var product = this.productsByIdentifier[name];
+        if (product){
+            return product.version;
+        }
+        return null;
+    },
+
+    containsComment: function(comment){
+        return this.commentSet.has(comment);
+    }
+
+});
+

package/Root/Frameworks/ImageKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ImageKit
-JSBundleVersion: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/SecurityKit/SECCBOR.js

@@ -44,6 +44,9 @@ JSClass("SECCBORParser", JSObject, {
     },
 
     readNext: function(){
+        if (this.offset >= this.data.length){
+            return null;
+        }
         var b = this.data[this.offset++];
         var info = b & 0x1F;
         var majorType = (b & 0xE0) >> 5;
@@ -65,6 +68,7 @@ JSClass("SECCBORParser", JSObject, {
             case SECCBOR.MajorType.other:
                 return this.readOther(info);
         }
+        return null;
     },
 
     readUnsignedInteger: function(info){

package/Root/Frameworks/SecurityKit/SECHTMLDeviceAuthentication.js

@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// #import Foundation
 // #import "SECDeviceAuthentication.js"
 // #import "SECCipher.js"
 // #import "SECSign.js"
@@ -99,21 +100,19 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
             challenge: registration.challengeData,
             pubKeyCredParams: [],
             authenticatorSelection: {
-                // Browser support for resident keys is spotty:
-                // - Chrome works, requiring the user to set a PIN, but can't share with others
-                // - Safari works, no PIN required, but can't share with others
-                // - Safari will get PIN support in Safari 14
-                // - Firefox doesn't work on macOS, but supposedly works on windows with a PIN
-                // Without a resident key, we need something like a username that the user can
-                // provide so we can lookup allowed key IDs on a server and send them back to
-                // the client before authenticating
-                requireResidentKey: false,
-                residentKey: "discouraged",
+                // requiring a resident key is necessary for Android to
+                // actually save a passkey.  Apple OSes will save a passkey
+                // regardless of resident key settings
+                requireResidentKey: registration.platform ? true : false,
+                residentKey: registration.platform ? "required" : "discouraged",
                 userVerification: registration.platform && !registration.conditional ? "required" : "discouraged",
                 authenticatorAttachment: registration.platform ? "platform" : "cross-platform"
             },
             attestation: "none",
-            timeout: 10000
+            timeout: 60000,
+            extensions: {
+                credProps: true
+            }
         };
         if (registration.domain !== undefined){
             info.rp.id = registration.domain;
@@ -141,6 +140,7 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
             var jwk = credential.response.getPublicJWK();
             var webauthn = credential.toJSON();
             var result = {
+                name: credential.jskitName,
                 jwk: jwk,
                 challenge: registration.challengeData,
                 webauthn: webauthn
@@ -187,9 +187,9 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
         }
         var info = {
             challenge: request.challengeData,
-            userVerification: "discouraged",
-            timeout: 10000,
-            allowCredentials: []
+            userVerification: request.platform ? "required" : "discouraged",
+            timeout: 60000,
+            allowCredentials: [],
         };
         if (request.domain){
             info.rpId = request.domain;
@@ -207,7 +207,7 @@ JSClass("SECHTMLDeviceAuthentication", JSObject, {
                         id: request.allowedKeyIDs[i].dataByDecodingBase64URL()
                     };
                     if (request.platform){
-                        allowedCredential.transports = ["internal"];
+                        allowedCredential.transports = ["internal", "hybrid"];
                     }
                     info.allowCredentials.push(allowedCredential);
                 }catch (e){
@@ -265,12 +265,65 @@ if (window.PublicKeyCredential){
             dictionary.rawId = JSData.initWithBuffer(this.rawId).base64URLStringRepresentation();
             dictionary.authenticatorAttachment = this.authenticatorAttachment || "";
             dictionary.type = this.type || "public-key";
-            dictionary.clientExtensionResults = this.getClientExtensionResults ? this.getClientExtensionResults() : {};
+            dictionary.clientExtensionResults = this.getClientExtensionResults();
             dictionary.response = this.response.toJSON ? this.response.toJSON() : {};
             return dictionary;
         };
     }
 
+    if (!window.PublicKeyCredential.prototype.getClientExtensionResults){
+        window.PublicKeyCredential.prototype.getClientExtensionResults = function PublicKeyCredential_getClientExtensionResults(){
+            if (this._clientExtensionResults === undefined){
+                var authData = JSData.initWithBuffer(this.getAuthenticatorData());
+                var idLength = (authData[53] << 8) | authData[54];
+                var offset = 55 + idLength;
+                var cbor = SECCBORParser.initWithData(authData.subdataInRange(JSRange(offset, authData.length - offset)));
+                var coseKey = cbor.readNext(); // ingored, only reading to arrive at the extensions start location
+                this._clientExtensionResults = cbor.readNext() || {};
+            }
+            return this._clientExtensionResults;
+        };
+    }
+
+    Object.defineProperties(window.PublicKeyCredential.prototype, {
+        jskitName: {
+            enumerable: false,
+            configurable: false,
+            get: function PublicKeyCredential_getJSKitName(){
+                var extensions = this.getClientExtensionResults();
+                if (extensions.credProps){
+                    if (extensions.credProps.authenticatorDisplayName){
+                        return extensions.credProps.authenticatorDisplayName;
+                    }
+                }
+                var ua = JSHTMLUserAgent.initWithString(navigator.userAgent);
+                var apple = ua.containsComment("Macintosh") || ua.containsComment("iPhone") || ua.containsComment("iPad");
+                var windows = ua.containsComment("Win64") || ua.containsComment("Windows NT 10.0");
+                var linux = ua.containsComment("Linux");
+                var android = false;
+                if (linux){
+                    var i, l;
+                    for (i = 0, l = ua.comments.length; i < l; ++i){
+                        if (ua.comments[i].startsWith("Android")){
+                            android = true;
+                            break;
+                        }
+                    }
+                }
+                if (apple){
+                    return "iCloud Keychain";
+                }
+                if (android){
+                    return "Google Password Manager";
+                }
+                if (windows){
+                    return "Windows Hello";
+                }
+                return "";
+            }
+        }
+    });
+
 }
 
 if (window.AuthenticatorAttestationResponse){

package/Root/Frameworks/ServerKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKit
-JSBundleVersion: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.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: 2024.40.0
+JSBundleVersion: 2024.41.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UIPlatform+HTML.js

@@ -21,8 +21,9 @@
 
 var mac = navigator.userAgent.indexOf("Macintosh") >= 0;
 var iphone = navigator.userAgent.indexOf("iPhone") >= 0;
+var ipad = navigator.userAgent.indexOf("iPad") >= 0;
 
-if (mac || iphone){
+if (mac || iphone || ipad){
     UIPlatform.shared = UIPlatform.initWithIdentifier(UIPlatform.Identifier.mac);
 }else{
     UIPlatform.shared = UIPlatform.initWithIdentifier(UIPlatform.Identifier.win);

package/Root/Frameworks/UIKitTesting/Info.yaml

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

package/package.json

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