@digipair/skill-push-notification 0.63.1 → 0.64.3

package/index.cjs.js

@@ -6413,20 +6413,69 @@ function setup(env) {
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        var i;
-        var split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-        var len = split.length;
-        for(i = 0; i < len; i++){
-            if (!split[i]) {
-                continue;
+        var split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = split[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var ns = _step.value;
+                if (ns[0] === "-") {
+                    createDebug.skips.push(ns.slice(1));
+                } else {
+                    createDebug.names.push(ns);
+                }
             }
-            namespaces = split[i].replace(/\*/g, ".*?");
-            if (namespaces[0] === "-") {
-                createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+    /**
+	 * Checks if the given string matches a namespace template, honoring
+	 * asterisks as wildcards.
+	 *
+	 * @param {String} search
+	 * @param {String} template
+	 * @return {Boolean}
+	 */ function matchesTemplate(search, template) {
+        var searchIndex = 0;
+        var templateIndex = 0;
+        var starIndex = -1;
+        var matchIndex = 0;
+        while(searchIndex < search.length){
+            if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+                // Match character or proceed with wildcard
+                if (template[templateIndex] === "*") {
+                    starIndex = templateIndex;
+                    matchIndex = searchIndex;
+                    templateIndex++; // Skip the '*'
+                } else {
+                    searchIndex++;
+                    templateIndex++;
+                }
+            } else if (starIndex !== -1) {
+                // Backtrack to the last '*' and try to match more characters
+                templateIndex = starIndex + 1;
+                matchIndex++;
+                searchIndex = matchIndex;
             } else {
-                createDebug.names.push(new RegExp("^" + namespaces + "$"));
+                return false; // No match
             }
         }
+        // Handle trailing '*' in template
+        while(templateIndex < template.length && template[templateIndex] === "*"){
+            templateIndex++;
+        }
+        return templateIndex === template.length;
     }
     /**
 	* Disable debug output.
@@ -6434,7 +6483,7 @@ function setup(env) {
 	* @return {String} namespaces
 	* @api public
 	*/ function disable() {
-        var namespaces = _to_consumable_array(createDebug.names.map(toNamespace)).concat(_to_consumable_array(createDebug.skips.map(toNamespace).map(function(namespace) {
+        var namespaces = _to_consumable_array(createDebug.names).concat(_to_consumable_array(createDebug.skips.map(function(namespace) {
             return "-" + namespace;
         }))).join(",");
         createDebug.enable("");
@@ -6447,32 +6496,52 @@ function setup(env) {
 	* @return {Boolean}
 	* @api public
 	*/ function enabled(name) {
-        if (name[name.length - 1] === "*") {
-            return true;
-        }
-        var i;
-        var len;
-        for(i = 0, len = createDebug.skips.length; i < len; i++){
-            if (createDebug.skips[i].test(name)) {
-                return false;
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = createDebug.skips[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var skip = _step.value;
+                if (matchesTemplate(name, skip)) {
+                    return false;
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
-        for(i = 0, len = createDebug.names.length; i < len; i++){
-            if (createDebug.names[i].test(name)) {
-                return true;
+        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+        try {
+            for(var _iterator1 = createDebug.names[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                var ns = _step1.value;
+                if (matchesTemplate(name, ns)) {
+                    return true;
+                }
+            }
+        } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                    _iterator1.return();
+                }
+            } finally{
+                if (_didIteratorError1) {
+                    throw _iteratorError1;
+                }
             }
         }
         return false;
     }
-    /**
-	* Convert regexp to namespace
-	*
-	* @param {RegExp} regxep
-	* @return {String} namespace
-	* @api private
-	*/ function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-    }
     /**
 	* Coerce `val`.
 	*
@@ -6616,6 +6685,7 @@ function useColors() {
     var m;
     // Is webkit? http://stackoverflow.com/a/16459606/376773
     // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+    // eslint-disable-next-line no-return-assign
     return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || // Is firebug? http://stackoverflow.com/a/398120/376773
     typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || // Is firefox >= v31?
     // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
@@ -7798,8 +7868,12 @@ var Agent = /*#__PURE__*/ function(_http_Agent) {
                 }).then(function(socket) {
                     _this.decrementSockets(name, fakeSocket);
                     if (_instanceof(socket, http.Agent)) {
-                        // @ts-expect-error `addRequest()` isn't defined in `@types/node`
-                        return socket.addRequest(req, connectOpts);
+                        try {
+                            // @ts-expect-error `addRequest()` isn't defined in `@types/node`
+                            return socket.addRequest(req, connectOpts);
+                        } catch (err) {
+                            return cb(err);
+                        }
                     }
                     _this[INTERNAL].currentSocket = socket;
                     // @ts-expect-error `createSocket()` isn't defined in `@types/node`
@@ -8280,6 +8354,14 @@ var agent_base_1 = dist;
 var url_1 = require$$3__default$1["default"];
 var parse_proxy_response_1 = parseProxyResponse$1;
 var debug = (0, debug_1.default)("https-proxy-agent");
+var setServernameFromNonIpHost = function(options) {
+    if (options.servername === undefined && options.host && !net.isIP(options.host)) {
+        return _object_spread_props(_object_spread({}, options), {
+            servername: options.host
+        });
+    }
+    return options;
+};
 /**
  * The `HttpsProxyAgent` implements an HTTP Agent subclass that connects to
  * the specified "HTTP(s) proxy server" in order to proxy HTTPS requests.
@@ -8328,7 +8410,7 @@ var debug = (0, debug_1.default)("https-proxy-agent");
      */ function connect(req, opts) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var proxy, socket, servername, headers, host, payload, auth, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, name, proxyResponsePromise, _ref, connect, buffered, servername1, fakeSocket;
+                    var proxy, socket, headers, host, payload, auth, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, name, proxyResponsePromise, _ref, connect, buffered, fakeSocket;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -8338,10 +8420,7 @@ var debug = (0, debug_1.default)("https-proxy-agent");
                                 }
                                 if (proxy.protocol === "https:") {
                                     debug("Creating `tls.Socket`: %o", _this.connectOpts);
-                                    servername = _this.connectOpts.servername || _this.connectOpts.host;
-                                    socket = tls.connect(_object_spread_props(_object_spread({}, _this.connectOpts), {
-                                        servername: servername
-                                    }));
+                                    socket = tls.connect(setServernameFromNonIpHost(_this.connectOpts));
                                 } else {
                                     debug("Creating `net.Socket`: %o", _this.connectOpts);
                                     socket = net.connect(_this.connectOpts);
@@ -8394,12 +8473,10 @@ var debug = (0, debug_1.default)("https-proxy-agent");
                                         // The proxy is connecting to a TLS server, so upgrade
                                         // this socket connection to a TLS connection.
                                         debug("Upgrading socket connection to TLS");
-                                        servername1 = opts.servername || opts.host;
                                         return [
                                             2,
-                                            tls.connect(_object_spread_props(_object_spread({}, omit(opts, "host", "path", "port")), {
-                                                socket: socket,
-                                                servername: servername1
+                                            tls.connect(_object_spread_props(_object_spread({}, omit(setServernameFromNonIpHost(opts), "host", "path", "port")), {
+                                                socket: socket
                                             }))
                                         ];
                                     }

package/index.esm.js

@@ -6394,20 +6394,69 @@ function setup(env) {
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        var i;
-        var split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-        var len = split.length;
-        for(i = 0; i < len; i++){
-            if (!split[i]) {
-                continue;
+        var split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = split[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var ns = _step.value;
+                if (ns[0] === "-") {
+                    createDebug.skips.push(ns.slice(1));
+                } else {
+                    createDebug.names.push(ns);
+                }
             }
-            namespaces = split[i].replace(/\*/g, ".*?");
-            if (namespaces[0] === "-") {
-                createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+    /**
+	 * Checks if the given string matches a namespace template, honoring
+	 * asterisks as wildcards.
+	 *
+	 * @param {String} search
+	 * @param {String} template
+	 * @return {Boolean}
+	 */ function matchesTemplate(search, template) {
+        var searchIndex = 0;
+        var templateIndex = 0;
+        var starIndex = -1;
+        var matchIndex = 0;
+        while(searchIndex < search.length){
+            if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+                // Match character or proceed with wildcard
+                if (template[templateIndex] === "*") {
+                    starIndex = templateIndex;
+                    matchIndex = searchIndex;
+                    templateIndex++; // Skip the '*'
+                } else {
+                    searchIndex++;
+                    templateIndex++;
+                }
+            } else if (starIndex !== -1) {
+                // Backtrack to the last '*' and try to match more characters
+                templateIndex = starIndex + 1;
+                matchIndex++;
+                searchIndex = matchIndex;
             } else {
-                createDebug.names.push(new RegExp("^" + namespaces + "$"));
+                return false; // No match
             }
         }
+        // Handle trailing '*' in template
+        while(templateIndex < template.length && template[templateIndex] === "*"){
+            templateIndex++;
+        }
+        return templateIndex === template.length;
     }
     /**
 	* Disable debug output.
@@ -6415,7 +6464,7 @@ function setup(env) {
 	* @return {String} namespaces
 	* @api public
 	*/ function disable() {
-        var namespaces = _to_consumable_array(createDebug.names.map(toNamespace)).concat(_to_consumable_array(createDebug.skips.map(toNamespace).map(function(namespace) {
+        var namespaces = _to_consumable_array(createDebug.names).concat(_to_consumable_array(createDebug.skips.map(function(namespace) {
             return "-" + namespace;
         }))).join(",");
         createDebug.enable("");
@@ -6428,32 +6477,52 @@ function setup(env) {
 	* @return {Boolean}
 	* @api public
 	*/ function enabled(name) {
-        if (name[name.length - 1] === "*") {
-            return true;
-        }
-        var i;
-        var len;
-        for(i = 0, len = createDebug.skips.length; i < len; i++){
-            if (createDebug.skips[i].test(name)) {
-                return false;
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = createDebug.skips[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var skip = _step.value;
+                if (matchesTemplate(name, skip)) {
+                    return false;
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
             }
         }
-        for(i = 0, len = createDebug.names.length; i < len; i++){
-            if (createDebug.names[i].test(name)) {
-                return true;
+        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+        try {
+            for(var _iterator1 = createDebug.names[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                var ns = _step1.value;
+                if (matchesTemplate(name, ns)) {
+                    return true;
+                }
+            }
+        } catch (err) {
+            _didIteratorError1 = true;
+            _iteratorError1 = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                    _iterator1.return();
+                }
+            } finally{
+                if (_didIteratorError1) {
+                    throw _iteratorError1;
+                }
             }
         }
         return false;
     }
-    /**
-	* Convert regexp to namespace
-	*
-	* @param {RegExp} regxep
-	* @return {String} namespace
-	* @api private
-	*/ function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-    }
     /**
 	* Coerce `val`.
 	*
@@ -6597,6 +6666,7 @@ function useColors() {
     var m;
     // Is webkit? http://stackoverflow.com/a/16459606/376773
     // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+    // eslint-disable-next-line no-return-assign
     return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || // Is firebug? http://stackoverflow.com/a/398120/376773
     typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || // Is firefox >= v31?
     // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
@@ -7779,8 +7849,12 @@ var Agent = /*#__PURE__*/ function(_http_Agent) {
                 }).then(function(socket) {
                     _this.decrementSockets(name, fakeSocket);
                     if (_instanceof(socket, http.Agent)) {
-                        // @ts-expect-error `addRequest()` isn't defined in `@types/node`
-                        return socket.addRequest(req, connectOpts);
+                        try {
+                            // @ts-expect-error `addRequest()` isn't defined in `@types/node`
+                            return socket.addRequest(req, connectOpts);
+                        } catch (err) {
+                            return cb(err);
+                        }
                     }
                     _this[INTERNAL].currentSocket = socket;
                     // @ts-expect-error `createSocket()` isn't defined in `@types/node`
@@ -8261,6 +8335,14 @@ var agent_base_1 = dist;
 var url_1 = require$$3$1;
 var parse_proxy_response_1 = parseProxyResponse$1;
 var debug = (0, debug_1.default)("https-proxy-agent");
+var setServernameFromNonIpHost = function(options) {
+    if (options.servername === undefined && options.host && !net.isIP(options.host)) {
+        return _object_spread_props(_object_spread({}, options), {
+            servername: options.host
+        });
+    }
+    return options;
+};
 /**
  * The `HttpsProxyAgent` implements an HTTP Agent subclass that connects to
  * the specified "HTTP(s) proxy server" in order to proxy HTTPS requests.
@@ -8309,7 +8391,7 @@ var debug = (0, debug_1.default)("https-proxy-agent");
      */ function connect(req, opts) {
                 var _this = this;
                 return _async_to_generator(function() {
-                    var proxy, socket, servername, headers, host, payload, auth, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, name, proxyResponsePromise, _ref, connect, buffered, servername1, fakeSocket;
+                    var proxy, socket, headers, host, payload, auth, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, name, proxyResponsePromise, _ref, connect, buffered, fakeSocket;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -8319,10 +8401,7 @@ var debug = (0, debug_1.default)("https-proxy-agent");
                                 }
                                 if (proxy.protocol === "https:") {
                                     debug("Creating `tls.Socket`: %o", _this.connectOpts);
-                                    servername = _this.connectOpts.servername || _this.connectOpts.host;
-                                    socket = tls.connect(_object_spread_props(_object_spread({}, _this.connectOpts), {
-                                        servername: servername
-                                    }));
+                                    socket = tls.connect(setServernameFromNonIpHost(_this.connectOpts));
                                 } else {
                                     debug("Creating `net.Socket`: %o", _this.connectOpts);
                                     socket = net.connect(_this.connectOpts);
@@ -8375,12 +8454,10 @@ var debug = (0, debug_1.default)("https-proxy-agent");
                                         // The proxy is connecting to a TLS server, so upgrade
                                         // this socket connection to a TLS connection.
                                         debug("Upgrading socket connection to TLS");
-                                        servername1 = opts.servername || opts.host;
                                         return [
                                             2,
-                                            tls.connect(_object_spread_props(_object_spread({}, omit(opts, "host", "path", "port")), {
-                                                socket: socket,
-                                                servername: servername1
+                                            tls.connect(_object_spread_props(_object_spread({}, omit(setServernameFromNonIpHost(opts), "host", "path", "port")), {
+                                                socket: socket
                                             }))
                                         ];
                                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-push-notification",
-  "version": "0.63.1",
+  "version": "0.64.3",
   "dependencies": {},
   "main": "./index.cjs.js",
   "module": "./index.esm.js"