@breakside/jskit 2023.20.0 → 2023.22.0

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){

package/Node/Resources.js

@@ -291,136 +291,37 @@ var addMetadata = {
     },
 
     '.png': async function(name, contents, metadata){
-        if (contents.length >= 24 &&
-            // magic
-            contents[0] == 0x89 &&
-            contents[1] == 0x50 &&
-            contents[2] == 0x4E &&
-            contents[3] == 0x47 &&
-            contents[4] == 0x0D &&
-            contents[5] == 0x0A &&
-            contents[6] == 0x1A &&
-            contents[7] == 0x0A && 
-
-            // IHDR
-            contents[12] == 0x49 &&
-            contents[13] == 0x48 &&
-            contents[14] == 0x44 &&
-            contents[15] == 0x52)
-        {
-            var dataView = contents.dataView();
+        var contentType = JSImage.contentTypeOfData(contents);
+        if (contentType !== null && contentType.subtype === "png"){
+            var image = JSImage.initWithData(contents);
             metadata.image = {
-                width: dataView.getUint32(16),
-                height: dataView.getUint32(20)
+                width: image.size.width,
+                height: image.size.height
             };
         }
     },
 
     '.jpg': async function(name, contents, metadata){
-        if (contents.length < 2 || contents[0] != 0xFF || contents[1] != 0xD8){
-            // not a jpeg
-            return;
-        }
-        var dataView = contents.dataView();
-        var i = 0;
-        var b;
-        var l = contents.length;
-        var blockLength;
-        var blockdata;
-        while (i < l){
-            b = contents[i++];
-            if (b != 0xFF){
-                // TODO: Error, not at a maker
-                return;
-            }
-            if (i == l){
-                // TODO: Error, not enough room for marker
-                return;
-            }
-            b = contents[i++];
-            if (b == 0x00){
-                // TODO: Error, invalid marker
-                return;
-            }
-            // D0-D9 are standalone markers...make sure not to look for a length
-            if (b < 0xD0 || b > 0xD9){
-                if (i >= l - 2){
-                    // TODO: Error, not enough room for block header
-                    return;
-                }
-                blockLength = dataView.getUint16(i);
-                if (i + blockLength > l){
-                    // TODO: Error, not enough room for block data
-                    return;
-                }
-                // C0-CF are start of frame blocks, expect for C4 and CC
-                // start of frame blocks have image sizes
-                if (b >= 0xC0 && b <= 0xCF && b != 0xC4 && b != 0xCC){
-                    if (blockLength >= 7){
-                        metadata.image = {
-                            height: dataView.getUint16(i + 3),
-                            width: dataView.getUint16(i + 5)
-                        };
-                    }
-                    return;
-                }
-                i += blockLength;
-            }
+        var contentType = JSImage.contentTypeOfData(contents);
+        if (contentType !== null && contentType.subtype === "jpeg"){
+            var image = JSImage.initWithData(contents);
+            metadata.image = {
+                width: image.size.width,
+                height: image.size.height
+            };
         }
     },
 
     '.svg': async function(name, contents, metadata){
-        metadata.image = {
-            vector: true
-        };
-        var parser = JSXMLParser.initWithData(contents);
-        parser.delegate  = {
-            xmlParserDidBeginElement: function(parser, name, prefix, namespace, attributes){
-                var multiple = {
-                    'em': 12,
-                    'ex': 24,
-                    'px': 1,
-                    'in': 72,
-                    'cm': 72/2.54,
-                    'mm': 72/25.4,
-                    'pt': 1,
-                    'pc': 12
-                };
-                var px = function(length){
-                    if (length === undefined || length === null){
-                        return undefined;
-                    }
-                    var matches = length.match(/^\s*(\d+)\s*(em|ex|px|in|cm|mm|pt|pc|%)?\s*$/);
-                    if (!matches){
-                        return undefined;
-                    }
-                    let n = parseInt(matches[1]);
-                    if (!matches[2]){
-                        return n;
-                    }
-                    let unit = matches[2];
-                    if (unit == '%'){
-                        return undefined;
-                    }
-                    return multiple[unit] * n;
-                };
-                if (namespace == 'http://www.w3.org/2000/svg' && name.toLowerCase() == 'svg'){
-                    let width = attributes.get("width");
-                    let height = attributes.get("height");
-                    let viewBox = attributes.get("viewBox");
-                    if (width && height){
-                        metadata.image.width = px(width);
-                        metadata.image.height = px(height);
-                    }else if (viewBox){
-                        var box = viewBox.split(/\s+/).map(n => parseInt(n));
-                        metadata.image.width = box[2];
-                        metadata.image.height = box[3];
-                    }
-                }
-                parser.stop();
-            }
-        };
-        parser.parse();
+        var contentType = JSImage.contentTypeOfData(contents);
+        if (contentType !== null && contentType.subtype === "svg+xml"){
+            var image = JSImage.initWithData(contents);
+            metadata.image = {
+                vector: true,
+                width: image.size.width,
+                height: image.size.height
+            };
+        }
     },
 
     '.ttf': async function(name, contents, metadata){

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

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
   "Info": {
     "JSBundleType": "node",
     "JSBundleIdentifier": "io.breakside.jskit",
-    "JSBundleVersion": "2023.20.0",
+    "JSBundleVersion": "2023.22.0",
     "JSExecutableName": "jskit",
     "NPMOrganization": "breakside",
     "JSResources": [
       "Tests/HTMLTestRunner.js",
       "Tests/NodeTestRunner.js"
     ],
-    "GitRevision": "494ac01eeb44fd4791c7d3e18b161ad60ba0f8da"
+    "GitRevision": "c5e74a677a557876be14d6e2bf15b95202dcea6e"
   },
   "Resources": [
     {

package/Root/Frameworks/APIKit/Info.yaml

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

package/Root/Frameworks/Foundation/JSImage.js

@@ -417,16 +417,18 @@ _JSDataImage.sizeFromSVGData = function(data){
                 return multiple[unit] * n;
             };
             if (namespace == 'http://www.w3.org/2000/svg' && name.toLowerCase() == 'svg'){
-                var width = attributes.get("width");
-                var height = attributes.get("height");
+                var width = px(attributes.get("width"));
+                var height = px(attributes.get("height"));
                 var viewBox = attributes.get("viewBox");
-                if (width && height){
-                    size.width = px(width);
-                    size.height = px(height);
+                if (width !== undefined && height !== undefined){
+                    size.width = width;
+                    size.height = height;
                 }else if (viewBox){
                     var box = viewBox.split(/\s+/).map(function(n){ return parseInt(n); });
-                    size.width = box[2];
-                    size.height = box[3];
+                    if (!isNaN(box[2]) && !isNaN(box[3])){
+                        size.width = box[2];
+                        size.height = box[3];
+                    }
                 }
             }
             parser.stop();

package/Root/Frameworks/Foundation/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/Root/Frameworks/ImageKit/Info.yaml

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

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,10 +1,11 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2023.20.0
+JSBundleVersion: 2023.22.0
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 JSBundleEnvironments:
     html: NotificationKit+HTML.js
+    node: NotificationKit+Node.js
 JSLicenseNotice: |
    Licensed under the Breakside Public License, Version 1.0 (the "License");
    you may not use this file except in compliance with the License.

package/Root/Frameworks/NotificationKit/NKHTMLUserNotificationCenter.js

@@ -35,44 +35,85 @@ JSClass("NKHTMLUserNotificationCenter", NKUserNotificationCenter, {
     domDocument: null,
     serviceWorkerContainer: null,
 
-    registerForRemoteNotifications: function(request, completion, target){
+    registerForRemoteNotifications: function(completion, target){
         if (!completion){
-            completion = Promise.completion();
+            completion = Promise.completion(Promise.rejectNonNullSecondArgument);
         }
         if (this.serviceWorkerContainer === null){
-            logger.warn("Remote notifications not supported on this device (no service workers)");
-            JSRunLoop.main.schedule(completion, target, null);
+            JSRunLoop.main.schedule(completion, target, null, new Error("Remote notifications not supported on this device (no service workers)"));
         }else{
+            var notificationCenter = this;
             this.serviceWorkerContainer.getRegistration().then(function(serviceWorkerRegistration){
                 if (!serviceWorkerRegistration){
-                    logger.warn("Missing service worker registration");
-                    completion.call(target, null);
+                    completion.call(target, null, new Error("Missing service worker registration"));
                     return;
                 }
                 if (!serviceWorkerRegistration.pushManager){
-                    logger.warn("Remote notifications not supported on this device (no push manager)");
-                    completion.call(target, null);
+                    completion.call(target, null, new Error("Remote notifications not supported on this device (no push manager)"));
                     return;
                 }
-                var options = {};
-                if (request.signingJWK !== null){
+                var options = {
+                    userVisibleOnly: true
+                };
+                if (notificationCenter.webPushApplicationServerJWK){
                     options.applicationServerKey = JSData.initWithChunks([
                         JSData.initWithArray([0x04]),
-                        request.signingJWK.x.dataByDecodingBase64URL(),
-                        request.signingJWK.y.dataByDecodingBase64URL()
+                        notificationCenter.webPushApplicationServerJWK.x.dataByDecodingBase64URL(),
+                        notificationCenter.webPushApplicationServerJWK.y.dataByDecodingBase64URL()
                     ]).base64URLStringRepresentation();
                 }
                 serviceWorkerRegistration.pushManager.subscribe(options).then(function(subscription){
                     var registration = {
                         type: NKUserNotificationCenter.RegistrationType.web,
-                        endpoint: subscription.endpoint,
-                        encryptionKey: JSData.initWithBuffer(subscription.getKey("p256dh")).base64URLStringRepresentation(),
-                        secret: JSData.initWithBuffer(subscription.getKey("auth")).base64URLStringRepresentation()
+                        options: {
+                            applicationServerJWK: notificationCenter.webPushApplicationServerJWK,
+                        },
+                        subscription: {
+                            endpoint: subscription.endpoint,
+                            expirationTime: subscription.expirationTime,
+                            keys: {
+                                p256dh: JSData.initWithBuffer(subscription.getKey("p256dh")).base64URLStringRepresentation(),
+                                auth: JSData.initWithBuffer(subscription.getKey("auth")).base64URLStringRepresentation()
+                            },
+                        }
                     };
-                    completion.call(target, registration);
+                    completion.call(target, registration, null);
+                }, function(error){
+                    completion.call(target, null, error);
+                });
+            });
+        }
+        return completion.promise;
+    },
+
+    unregisterForRemoteNotifications: function(completion, target){
+        if (!completion){
+            completion = Promise.completion(Promise.rejectNonNullFirstArgument);
+        }
+        if (this.serviceWorkerContainer === null){
+            JSRunLoop.main.schedule(completion, target, new Error("Remote notifications not supported on this device (no service workers)"));
+        }else{
+            this.serviceWorkerContainer.getRegistration().then(function(serviceWorkerRegistration){
+                if (!serviceWorkerRegistration){
+                    completion.call(target, new Error("Missing service worker registration"));
+                    return;
+                }
+                if (!serviceWorkerRegistration.pushManager){
+                    completion.call(target, new Error("Remote notifications not supported on this device (no push manager)"));
+                    return;
+                }
+                serviceWorkerRegistration.pushManager.getSubscription().then(function(subscription){
+                    if (subscription){
+                        subscription.unsubscribe(function(){
+                            completion.call(target, null);
+                        }, function(error){
+                            completion.call(target, error);
+                        });
+                    }else{
+                        completion.call(target, null);
+                    }
                 }, function(error){
-                    logger.error("Failed to subscribe to push: %{error}", error);
-                    completion.call(target, null);
+                    completion.call(target, error);
                 });
             });
         }

package/Root/Frameworks/NotificationKit/NKUserNotification.js

@@ -21,6 +21,8 @@ JSClass("NKUserNotification", JSObject, {
     title: null,
     body: null,
     identifier: null,
+    timeToLive: 3600,
+    priority: 0,
 
     initWithTitle: function(title, body){
         this.title = title;
@@ -28,4 +30,13 @@ JSClass("NKUserNotification", JSObject, {
         this.identifier = UUID();
     }
 
-});
+});
+
+NKUserNotification.Priority = {
+
+    normal: 0,
+    veryLow: 1,
+    low: 2,
+    high: 3,
+
+};