@breakside/jskit 2024.33.0 → 2024.40.0

package/Info.json

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

package/Node/KeyCommand.js

@@ -30,7 +30,14 @@ JSClass("KeyCommand", Command, {
 
     run: async function(){
         var workspaceURL = this.workingDirectoryURL;
-        var data = SECCipher.getRandomData(this.arguments.bits >> 3);
+        var hmacAlgorithm = {
+            256: SECHMAC.Algorithm.sha256,
+            384: SECHMAC.Algorithm.sha384,
+            512: SECHMAC.Algorithm.sha512
+        }[this.arguments.bits];
+        var hmac = SECHMAC.initWithAlgorithm(hmacAlgorithm);
+        var key = await hmac.createKey();
+        var data = key.getData();
         var printer = Printer.initWithLabel('key');
         if (this.arguments.format === "jwk"){
             var jwk = {

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.33.0",
+    "JSBundleVersion": "2024.40.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "2677079d37e78e1708c6e0985e71548b6001c1b6"
+    "GitRevision": "f17cafe60642c3c9674095789dec1d1803b72586"
   },
   "Resources": [
     {

package/Node/jskit

@@ -156,6 +156,7 @@ require("./../Frameworks/SecurityKit.jsframework/JS/SECKeychain.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECHMAC.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECSign.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECJSONWebToken.js");
+require("./../Frameworks/SecurityKit.jsframework/JS/SECJSONWebEncryption.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECPassword.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECASN1.js");
 require("./../Frameworks/SecurityKit.jsframework/JS/SECASN1Parser.js");

package/Root/Frameworks/APIKit/Info.yaml

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

package/Root/Frameworks/DBKit/DBEncryptedObject.js

@@ -65,7 +65,7 @@ JSClass("DBEncryptedObject", JSObject, {
         if (!completion){
             completion = Promise.completion(Promise.resolveTrue);
         }
-        var cipher = SECCipher.initWithAlgorithm(algorithm, keyBitLength);
+        var cipher = SECCipher.initWithAlgorithm(algorithm, {keyBitLength: keyBitLength});
         var key = cipher.createKeyFromKeystore(this.keystore, keyIdentifier, function(key){
             if (key === null){
                 completion.call(target, false);
@@ -101,7 +101,7 @@ JSClass("DBEncryptedObject", JSObject, {
             completion = Promise.completion(Promise.resolveNonNull);
         }
         if (this.object === null && this.encrypted !== null && this.keystore !== null){
-            var cipher = SECCipher.initWithAlgorithm(this.algorithm, this.keyBitLength);
+            var cipher = SECCipher.initWithAlgorithm(this.algorithm, {keyBitLength: this.keyBitLength});
             cipher.createKeyFromKeystore(this.keystore, this.keyIdentifier, function(key){
                 if (key === null){
                     completion.call(target, null);

package/Root/Frameworks/DBKit/Info.yaml

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

package/Root/Frameworks/Foundation/Info.yaml

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

package/Root/Frameworks/Foundation/JSClass.js

@@ -177,7 +177,10 @@ JSClass.prototype = {
                 }
                 if (result instanceof Promise){
                     return result.then(function(promiseResult){
-                        return promiseResult || obj;
+                        if (promiseResult === undefined){
+                            return obj;
+                        }
+                        return promiseResult;
                     });
                 }
                 return result;

package/Root/Frameworks/Foundation/JSFile.js

@@ -21,8 +21,8 @@
 JSClass("JSFile", JSObject, {
 
     url: JSReadOnlyProperty(null, null, 'getURL'),
-    name: JSReadOnlyProperty('_name', null),
-    contentType: JSReadOnlyProperty('_contentType', null),
+    name: JSDynamicProperty('_name', null),
+    contentType: JSDynamicProperty('_contentType', null),
     size: JSReadOnlyProperty('_size', 0),
 
     initWithData: function(data, name, contentType){
@@ -55,6 +55,27 @@ JSClass("JSFile", JSObject, {
 
 });
 
+JSFile.contentTypesByFileExtension = {};
+
+JSFile.registerContentTypeForFileExtension = function(contentType, fileExtension){
+    fileExtension = fileExtension.toLowerCase();
+    JSFile.contentTypesByFileExtension[fileExtension] = contentType;
+};
+
+JSFile.unregisterContentTypeForFileExtension = function(contentType, fileExtension){
+    fileExtension = fileExtension.toLowerCase();
+    var registeredContentType = JSFile.contentTypesByFileExtension[fileExtension];
+    if (registeredContentType !== undefined){
+        if (registeredContentType.mime === contentType.mime){
+            delete JSFile.contentTypesByFileExtension[fileExtension];
+        }
+    }
+};
+
+JSFile.contentTypeForFileExtension = function(fileExtension){
+    return JSFile.contentTypesByFileExtension[fileExtension] || null;
+};
+
 JSClass("JSDataFile", JSFile, {
 
     _data: null,

package/Root/Frameworks/Foundation/JSHTMLFile.js

@@ -31,6 +31,10 @@ JSClass("JSHTMLFile", JSFile, {
     initWithFile: function(file){
         this.initWithBlob(file);
         this._name = file.name;
+        var contentType = JSFile.contentTypeForFileExtension(this._name.fileExtension);
+        if (contentType !== null){
+            this._contentType = JSMediaType(contentType);
+        }
     },
 
     initWithBlob: function(blob){

package/Root/Frameworks/Foundation/JSNodeURLSessionStreamTask.js

@@ -92,7 +92,7 @@ JSClass("JSNodeURLSessionStreamTask", JSURLSessionStreamTask, {
     },
 
     write: function(data){
-        this.socket.write(data.nodeBuffer);
+        this.socket.write(data.nodeBuffer());
     },
 
     // ----------------------------------------------------------------------

package/Root/Frameworks/Foundation/JSSynchronizer.js

@@ -45,18 +45,22 @@ JSClass("JSSynchronizer", JSObject, {
         return this._scheduleSync(0, completion, target);
     },
 
-    _isPaused: false,
+    _pauseCount: 0,
     _syncOnResume: false,
 
     pause: function(){
-        this._isPaused = true;
+        ++this._pauseCount;
     },
 
     resume: function(){
-        this._isPaused = false;
-        if (this._syncOnResume){
-            this._syncOnResume = true;
-            this._scheduleSync(0, function(){});
+        if (this._pauseCount > 0){
+            --this._pauseCount;
+            if (this._pauseCount === 0){
+                if (this._syncOnResume){
+                    this._syncOnResume = false;
+                    this._scheduleSync(0, function(){});
+                }
+            }
         }
     },
 
@@ -91,7 +95,7 @@ JSClass("JSSynchronizer", JSObject, {
     },
 
     _sync: function(){
-        if (this._isPaused){
+        if (this._pauseCount > 0){
             this._syncOnResume = true;
             return;
         }

package/Root/Frameworks/ImageKit/Info.yaml

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

package/Root/Frameworks/NotificationKit/NKWebPushService.js

@@ -162,12 +162,12 @@ JSClass("NKWebPushService", JSObject, {
             }).then(function(keyAndNonce){
                 var keyData = keyAndNonce[0].subdataInRange(JSRange(0, 16));
                 var nonceData = keyAndNonce[1].subdataInRange(JSRange(0, 12));
-                var cipher = SECCipher.initWithAlgorithm(SECCipher.Algorithm.aesGCM, 128);
+                var cipher = SECCipher.initWithAlgorithm(SECCipher.Algorithm.aesGCM, {keyBitLength: 128, iv: nonceData});
                 return cipher.createKeyWithData(keyData).then(function(key){
                     if (key === null){
                         return;
                     }
-                    return cipher.encryptWithNonce(nonceData, JSData.initWithChunks([plaintext, JSData.initWithArray([0x02])]), key);
+                    return cipher.encrypt(JSData.initWithChunks([plaintext, JSData.initWithArray([0x02])]), key);
                 });
             }).then(function(encrypted){
                 var ciphertext = encrypted.subdataInRange(JSRange(12, encrypted.length - 12));

package/Root/Frameworks/PDFKit/Info.yaml

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

package/Root/Frameworks/PDFKit/PDFEncryption.js

@@ -226,7 +226,7 @@ JSClass("PDFEncryption", JSObject, {
         }
 
         var keyData = this._generateObjectKeyData(stream.indirect.objectID, stream.indirect.generation, cipherAlgorithm);
-        var cipher = SECCipher.initWithAlgorithm(cipherAlgorithm);
+        var cipher = SECCipher.initWithAlgorithm(cipherAlgorithm, {keyBitLength: 128});
         cipher.createKeyWithData(keyData, function(key){
             if (key === null){
                 completion.call(target, null);

package/Root/Frameworks/QRKit/Info.yaml

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

package/Root/Frameworks/SecurityKit/SECCOSE.js

@@ -0,0 +1,135 @@
+// #import Foundation
+// #import "SECCBOR.js"
+// #import "SECJSONWebAlgorithms.js"
+"use strict";
+
+(function(){
+
+JSClass("SECCOSE", JSObject, {
+
+    dictionary: null,
+
+    initWithData: function(data){
+        var parser = SECCBORParser.initWithData(data);
+        this.dictionary = parser.readNext();
+    },
+
+    attribute: function(attr){
+        return this.dictionary[attr] || null;
+    },
+
+    derRepresentation: function(){
+        return JSData.init();
+    },
+
+    jwkRepresentation: function(){
+        var jwk = {};
+        switch (this.attribute(SECCOSE.Attribute.kty)){
+            case SECCOSE.KeyType.ellipticCurve:
+                jwk.kty = SECJSONWebAlgorithms.KeyType.ellipticCurve;
+                switch (this.attribute(SECCOSE.Attribute.alg)){
+                    case SECCOSE.Algorithm.ellipticCurveSHA256:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.ellipticCurveSHA256;
+                        break;
+                    case SECCOSE.Algorithm.ellipticCurveSHA384:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.ellipticCurveSHA384;
+                        break;
+                    case SECCOSE.Algorithm.ellipticCurveSHA512:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.ellipticCurveSHA512;
+                        break;
+                    default:
+                        return null;
+                }
+                switch (this.attribute(SECCOSE.Attribute.ellipticCurve_crv)){
+                    case SECCOSE.EllipticCurve.p256:
+                        jwk.crv = SECJSONWebAlgorithms.EllipticCurve.p256;
+                        break;
+                    case SECCOSE.EllipticCurve.p384:
+                        jwk.crv = SECJSONWebAlgorithms.EllipticCurve.p384;
+                        break;
+                    case SECCOSE.EllipticCurve.p521:
+                        jwk.crv = SECJSONWebAlgorithms.EllipticCurve.p521;
+                        break;
+                    default:
+                        return null;
+                }
+                jwk.x = this.attribute(SECCOSE.Attribute.ellipticCurve_x).base64URLStringRepresentation();
+                jwk.y = this.attribute(SECCOSE.Attribute.ellipticCurve_y).base64URLStringRepresentation();
+                break;
+            case SECCOSE.KeyType.rsa:
+                jwk.kty = SECJSONWebAlgorithms.KeyType.rsa;
+                switch (this.attribute(SECCOSE.Attribute.alg)){
+                    case SECCOSE.Algorithm.rsaSHA256:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.rsaSHA256;
+                        break;
+                    case SECCOSE.Algorithm.rsaSHA384:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.rsaSHA384;
+                        break;
+                    case SECCOSE.Algorithm.rsaSHA512:
+                        jwk.alg = SECJSONWebAlgorithms.Algorithm.rsaSHA512;
+                        break;
+                    default:
+                        return null;
+                }
+                jwk.n = this.attribute(SECCOSE.Attribute.rsa_n).base64URLStringRepresentation();
+                jwk.e = this.attribute(SECCOSE.Attribute.rsa_e).base64URLStringRepresentation();
+                break;
+            default:
+                return null;
+        }
+        return jwk;
+    }
+
+});
+
+SECCOSE.KeyType = {
+    ellipticCurve: 2,
+    rsa: 3,
+    symmetric: 4,
+};
+
+SECCOSE.Algorithm = {
+    rsaSHA256: -257,
+    rsaSHA384: -258,
+    rsaSHA512: -259,
+    ellipticCurveSHA256: -7,
+    ellipticCurveSHA384: -35,
+    ellipticCurveSHA512: -36,
+};
+
+SECCOSE.EllipticCurve = {
+    p256: 1,
+    p384: 2,
+    p521: 3
+};
+
+SECCOSE.Attribute = {
+    kty: 1,
+    kid: 2,
+    alg: 3,
+    key_ops: 4,
+
+    ellipticCurve_crv: -1,
+    ellipticCurve_x: -2,
+    ellipticCurve_y: -3,
+    ellipticCurve_d: -4,
+
+    rsa_n: -1,
+    rsa_e: -2,
+    rsa_d: -3,
+    rsa_p: -4,
+    rsa_q: -5,
+    rsa_dP: -6,
+    rsa_dQ: -7,
+    rsa_qInv: -8,
+    rsa_other: -9,
+    rsa_r_i: -10,
+    rsa_d_i: -11,
+    rsa_t_i: -12,
+
+    symmetric_k: -1
+
+};
+
+
+})();