@push.rocks/smartnetwork 3.0.2 → 4.0.0

package/dist_ts/smartnetwork.classes.smartnetwork.js

@@ -1,39 +1,95 @@
 import * as plugins from './smartnetwork.plugins.js';
 import { CloudflareSpeed } from './smartnetwork.classes.cloudflarespeed.js';
-/**
- * SmartNetwork simplifies actions within the network
- */
+import { getLogger } from './logging.js';
+import { NetworkError } from './errors.js';
+import * as stats from './helpers/stats.js';
 export class SmartNetwork {
+    /** Static registry for external plugins */
+    static { this.pluginsRegistry = new Map(); }
+    /** Register a plugin by name */
+    static registerPlugin(name, ctor) {
+        SmartNetwork.pluginsRegistry.set(name, ctor);
+    }
+    /** Unregister a plugin by name */
+    static unregisterPlugin(name) {
+        SmartNetwork.pluginsRegistry.delete(name);
+    }
+    constructor(options) {
+        this.options = options || {};
+        this.cache = new Map();
+    }
     /**
      * get network speed
-     * @param measurementTime
+     * @param opts optional speed test parameters
      */
-    async getSpeed() {
-        const cloudflareSpeedInstance = new CloudflareSpeed();
-        const test = await cloudflareSpeedInstance.speedTest();
-        return test;
+    async getSpeed(opts) {
+        const cloudflareSpeedInstance = new CloudflareSpeed(opts);
+        return cloudflareSpeedInstance.speedTest();
     }
-    async ping(hostArg, timeoutArg = 500) {
-        const smartpingInstance = new plugins.smartping.Smartping();
-        const pingResult = await smartpingInstance.ping(hostArg, timeoutArg);
-        return pingResult;
+    /**
+     * Send ICMP pings to a host. Optionally specify count for multiple pings.
+     */
+    async ping(host, opts) {
+        const timeout = opts?.timeout ?? 500;
+        const count = opts?.count && opts.count > 1 ? opts.count : 1;
+        const pinger = new plugins.smartping.Smartping();
+        if (count === 1) {
+            // single ping: normalize time to number
+            const res = await pinger.ping(host, timeout);
+            return {
+                ...res,
+                time: typeof res.time === 'number' ? res.time : NaN,
+            };
+        }
+        const times = [];
+        let aliveCount = 0;
+        for (let i = 0; i < count; i++) {
+            try {
+                const res = await pinger.ping(host, timeout);
+                const t = typeof res.time === 'number' ? res.time : NaN;
+                if (res.alive)
+                    aliveCount++;
+                times.push(t);
+            }
+            catch {
+                times.push(NaN);
+            }
+        }
+        const valid = times.filter((t) => !isNaN(t));
+        const min = valid.length ? Math.min(...valid) : NaN;
+        const max = valid.length ? Math.max(...valid) : NaN;
+        const avg = valid.length ? stats.average(valid) : NaN;
+        const stddev = valid.length
+            ? Math.sqrt(stats.average(valid.map((v) => (v - avg) ** 2)))
+            : NaN;
+        const packetLoss = ((count - aliveCount) / count) * 100;
+        return {
+            host,
+            count,
+            times,
+            min,
+            max,
+            avg,
+            stddev,
+            packetLoss,
+            alive: aliveCount > 0,
+        };
     }
     /**
      * returns a promise with a boolean answer
      * note: false also resolves with false as argument
      * @param port
      */
+    /**
+     * Check if a local port is unused (both IPv4 and IPv6)
+     */
     async isLocalPortUnused(port) {
         const doneIpV4 = plugins.smartpromise.defer();
         const doneIpV6 = plugins.smartpromise.defer();
         const net = await import('net'); // creates only one instance of net ;) even on multiple calls
         // test IPv4 space
         const ipv4Test = net.createServer();
-        ipv4Test.once('error', (err) => {
-            if (err.code !== 'EADDRINUSE') {
-                doneIpV4.resolve(false);
-                return;
-            }
+        ipv4Test.once('error', () => {
             doneIpV4.resolve(false);
         });
         ipv4Test.once('listening', () => {
@@ -46,11 +102,7 @@ export class SmartNetwork {
         await doneIpV4.promise;
         // test IPv6 space
         const ipv6Test = net.createServer();
-        ipv6Test.once('error', function (err) {
-            if (err.code !== 'EADDRINUSE') {
-                doneIpV6.resolve(false);
-                return;
-            }
+        ipv6Test.once('error', () => {
             doneIpV6.resolve(false);
         });
         ipv6Test.once('listening', () => {
@@ -70,30 +122,69 @@ export class SmartNetwork {
      * checks wether a remote port is available
      * @param domainArg
      */
-    async isRemotePortAvailable(domainArg, portArg) {
-        const done = plugins.smartpromise.defer();
-        const domainPart = domainArg.split(':')[0];
-        const port = portArg ? portArg : parseInt(domainArg.split(':')[1], 10);
-        plugins.isopen(domainPart, port, (response) => {
-            console.log(response);
-            if (response[port.toString()].isOpen) {
-                done.resolve(true);
-            }
-            else {
-                done.resolve(false);
-            }
-        });
-        const result = await done.promise;
-        return result;
+    /**
+     * Check if a remote port is available
+     * @param target host or "host:port"
+     * @param opts options including port, protocol (only tcp), retries and timeout
+     */
+    /**
+     * Check if a remote port is available
+     * @param target host or "host:port"
+     * @param portOrOpts either a port number (deprecated) or options object
+     */
+    async isRemotePortAvailable(target, portOrOpts) {
+        let hostPart;
+        let port;
+        let protocol = 'tcp';
+        let retries = 1;
+        let timeout;
+        // preserve old signature (target, port)
+        if (typeof portOrOpts === 'number') {
+            [hostPart] = target.split(':');
+            port = portOrOpts;
+        }
+        else {
+            const opts = portOrOpts || {};
+            protocol = opts.protocol ?? 'tcp';
+            retries = opts.retries ?? 1;
+            timeout = opts.timeout;
+            [hostPart] = target.split(':');
+            const portPart = target.split(':')[1];
+            port = opts.port ?? (portPart ? parseInt(portPart, 10) : undefined);
+        }
+        if (protocol === 'udp') {
+            throw new NetworkError('UDP port check not supported', 'ENOTSUP');
+        }
+        if (!port) {
+            throw new NetworkError('Port not specified', 'EINVAL');
+        }
+        let last = false;
+        for (let attempt = 0; attempt < retries; attempt++) {
+            const done = plugins.smartpromise.defer();
+            plugins.isopen(hostPart, port, (response) => {
+                const info = response[port.toString()];
+                done.resolve(Boolean(info?.isOpen));
+            });
+            last = await done.promise;
+            if (last)
+                return true;
+        }
+        return last;
     }
+    /**
+     * List network interfaces (gateways)
+     */
     async getGateways() {
-        const result = plugins.os.networkInterfaces();
-        return result;
+        const fetcher = async () => plugins.os.networkInterfaces();
+        if (this.options.cacheTtl && this.options.cacheTtl > 0) {
+            return this.getCached('gateways', fetcher);
+        }
+        return fetcher();
     }
     async getDefaultGateway() {
         const defaultGatewayName = await plugins.systeminformation.networkInterfaceDefault();
         if (!defaultGatewayName) {
-            console.log('Cannot determine default gateway');
+            getLogger().warn?.('Cannot determine default gateway');
             return null;
         }
         const gateways = await this.getGateways();
@@ -103,21 +194,125 @@ export class SmartNetwork {
             ipv6: defaultGateway[1],
         };
     }
+    /**
+     * Lookup public IPv4 and IPv6
+     */
     async getPublicIps() {
-        return {
-            v4: await plugins.publicIp.publicIpv4({
-                timeout: 1000,
-                onlyHttps: true,
-            }).catch(async (err) => {
-                return null;
-            }),
-            v6: await plugins.publicIp.publicIpv6({
-                timeout: 1000,
-                onlyHttps: true,
-            }).catch(async (err) => {
-                return null;
-            })
-        };
+        const fetcher = async () => ({
+            v4: await plugins.publicIp.publicIpv4({ timeout: 1000, onlyHttps: true }).catch(() => null),
+            v6: await plugins.publicIp.publicIpv6({ timeout: 1000, onlyHttps: true }).catch(() => null),
+        });
+        if (this.options.cacheTtl && this.options.cacheTtl > 0) {
+            return this.getCached('publicIps', fetcher);
+        }
+        return fetcher();
+    }
+    /**
+     * Resolve DNS records (A, AAAA, MX)
+     */
+    async resolveDns(host) {
+        try {
+            const dns = await import('dns');
+            const { resolve4, resolve6, resolveMx } = dns.promises;
+            const [A, AAAA, MX] = await Promise.all([
+                resolve4(host).catch(() => []),
+                resolve6(host).catch(() => []),
+                resolveMx(host).catch(() => []),
+            ]);
+            return { A, AAAA, MX };
+        }
+        catch (err) {
+            throw new NetworkError(err.message, err.code);
+        }
+    }
+    /**
+     * Perform a simple HTTP/HTTPS endpoint health check
+     */
+    async checkEndpoint(urlString, opts) {
+        const start = plugins.perfHooks.performance.now();
+        try {
+            const url = new URL(urlString);
+            const lib = url.protocol === 'https:' ? plugins.https : await import('http');
+            return new Promise((resolve, reject) => {
+                const req = lib.request(url, { method: 'GET', timeout: opts?.timeout, agent: false }, (res) => {
+                    res.on('data', () => { });
+                    res.once('end', () => {
+                        const rtt = plugins.perfHooks.performance.now() - start;
+                        const headers = {};
+                        for (const [k, v] of Object.entries(res.headers)) {
+                            headers[k] = Array.isArray(v) ? v.join(',') : String(v);
+                        }
+                        resolve({ status: res.statusCode, headers, rtt });
+                    });
+                });
+                req.on('error', (err) => reject(new NetworkError(err.message, err.code)));
+                req.end();
+            });
+        }
+        catch (err) {
+            throw new NetworkError(err.message, err.code);
+        }
+    }
+    /**
+     * Perform a traceroute: hop-by-hop latency using the system traceroute tool.
+     * Falls back to a single-hop stub if traceroute is unavailable or errors.
+     */
+    async traceroute(host, opts) {
+        const maxHops = opts?.maxHops ?? 30;
+        const timeout = opts?.timeout;
+        try {
+            const { exec } = await import('child_process');
+            const cmd = `traceroute -n -m ${maxHops} ${host}`;
+            const stdout = await new Promise((resolve, reject) => {
+                exec(cmd, { encoding: 'utf8', timeout }, (err, stdout) => {
+                    if (err)
+                        return reject(err);
+                    resolve(stdout);
+                });
+            });
+            const hops = [];
+            for (const raw of stdout.split('\n')) {
+                const line = raw.trim();
+                if (!line || line.startsWith('traceroute'))
+                    continue;
+                const parts = line.split(/\s+/);
+                const ttl = parseInt(parts[0], 10);
+                let ip;
+                let rtt;
+                if (parts[1] === '*' || !parts[1]) {
+                    ip = parts[1] || '';
+                    rtt = null;
+                }
+                else {
+                    ip = parts[1];
+                    const timePart = parts.find((p, i) => i >= 2 && /^\d+(\.\d+)?$/.test(p));
+                    rtt = timePart ? parseFloat(timePart) : null;
+                }
+                hops.push({ ttl, ip, rtt });
+            }
+            if (hops.length) {
+                return hops;
+            }
+        }
+        catch {
+            // traceroute not available or error: fall through to stub
+        }
+        // fallback stub
+        return [{ ttl: 1, ip: host, rtt: null }];
+    }
+    /**
+     * Internal caching helper
+     */
+    async getCached(key, fetcher) {
+        const now = Date.now();
+        const entry = this.cache.get(key);
+        if (entry && entry.expiry > now) {
+            return entry.value;
+        }
+        const value = await fetcher();
+        const ttl = this.options.cacheTtl || 0;
+        this.cache.set(key, { value, expiry: now + ttl });
+        return value;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZXR3b3JrLmNsYXNzZXMuc21hcnRuZXR3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRuZXR3b3JrLmNsYXNzZXMuc21hcnRuZXR3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMkJBQTJCLENBQUM7QUFFckQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTVFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFDdkI7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLFFBQVE7UUFDbkIsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLGVBQWUsRUFBRSxDQUFDO1FBQ3RELE1BQU0sSUFBSSxHQUFHLE1BQU0sdUJBQXVCLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDdkQsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU0sS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFlLEVBQUUsYUFBcUIsR0FBRztRQUN6RCxNQUFNLGlCQUFpQixHQUFHLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUM1RCxNQUFNLFVBQVUsR0FBRyxNQUFNLGlCQUFpQixDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDckUsT0FBTyxVQUFVLENBQUM7SUFDcEIsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsaUJBQWlCLENBQUMsSUFBWTtRQUN6QyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBVyxDQUFDO1FBQ3ZELE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFXLENBQUM7UUFDdkQsTUFBTSxHQUFHLEdBQUcsTUFBTSxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyw2REFBNkQ7UUFFOUYsa0JBQWtCO1FBQ2xCLE1BQU0sUUFBUSxHQUFHLEdBQUcs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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartnetwork.classes.smartnetwork.js","sourceRoot":"","sources":["../ts/smartnetwork.classes.smartnetwork.ts"],"names":[],"mappings":"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"}

package/dist_ts/smartnetwork.plugins.d.ts

@@ -2,9 +2,9 @@ import * as os from 'os';
 import * as https from 'https';
 import * as perfHooks from 'perf_hooks';
 export { os, https, perfHooks };
-import * as smartping from '@pushrocks/smartping';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smartping from '@push.rocks/smartping';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartstring from '@push.rocks/smartstring';
 export { smartpromise, smartping, smartstring };
 import isopen from 'isopen';
 import * as publicIp from 'public-ip';

package/dist_ts/smartnetwork.plugins.js

@@ -4,9 +4,9 @@ import * as https from 'https';
 import * as perfHooks from 'perf_hooks';
 export { os, https, perfHooks };
 // @pushrocks scope
-import * as smartping from '@pushrocks/smartping';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smartping from '@push.rocks/smartping';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartstring from '@push.rocks/smartstring';
 export { smartpromise, smartping, smartstring };
 // @third party scope
 // @ts-ignore
@@ -15,4 +15,4 @@ import isopen from 'isopen';
 import * as publicIp from 'public-ip';
 import * as systeminformation from 'systeminformation';
 export { isopen, publicIp, systeminformation };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZXR3b3JrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydG5ldHdvcmsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFlO0FBQ2YsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxLQUFLLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDL0IsT0FBTyxLQUFLLFNBQVMsTUFBTSxZQUFZLENBQUM7QUFFeEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFFaEMsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxTQUFTLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxLQUFLLFlBQVksTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssV0FBVyxNQUFNLHdCQUF3QixDQUFDO0FBRXRELE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBRWhELHFCQUFxQjtBQUNyQixhQUFhO0FBQ2IsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLGFBQWE7QUFDYixPQUFPLEtBQUssUUFBUSxNQUFNLFdBQVcsQ0FBQztBQUN0QyxPQUFPLEtBQUssaUJBQWlCLE1BQU0sbUJBQW1CLENBQUM7QUFFdkQsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZXR3b3JrLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydG5ldHdvcmsucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFlO0FBQ2YsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxLQUFLLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDL0IsT0FBTyxLQUFLLFNBQVMsTUFBTSxZQUFZLENBQUM7QUFFeEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLENBQUM7QUFFaEMsbUJBQW1CO0FBQ25CLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBRXZELE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxDQUFDO0FBRWhELHFCQUFxQjtBQUNyQixhQUFhO0FBQ2IsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLGFBQWE7QUFDYixPQUFPLEtBQUssUUFBUSxNQUFNLFdBQVcsQ0FBQztBQUN0QyxPQUFPLEtBQUssaUJBQWlCLE1BQU0sbUJBQW1CLENBQUM7QUFFdkQsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsaUJBQWlCLEVBQUUsQ0FBQyJ9

package/npmextra.json

@@ -6,12 +6,27 @@
   "gitzone": {
     "projectType": "npm",
     "module": {
-      "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "githost": "code.foss.global",
+      "gitscope": "push.rocks",
       "gitrepo": "smartnetwork",
-      "description": "network diagnostics",
-      "npmPackagename": "@pushrocks/smartnetwork",
-      "license": "MIT"
+      "description": "A toolkit for network diagnostics including speed tests, port availability checks, and more.",
+      "npmPackagename": "@push.rocks/smartnetwork",
+      "license": "MIT",
+      "keywords": [
+        "network diagnostics",
+        "ping",
+        "port check",
+        "speed test",
+        "network interface",
+        "public IP retrieval",
+        "Cloudflare speed test",
+        "network performance",
+        "network utility",
+        "TypeScript"
+      ]
     }
+  },
+  "tsdoc": {
+    "legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH  \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
   }
 }

package/package.json

@@ -1,32 +1,28 @@
 {
   "name": "@push.rocks/smartnetwork",
-  "version": "3.0.2",
+  "version": "4.0.0",
   "private": false,
-  "description": "network diagnostics",
+  "description": "A toolkit for network diagnostics including speed tests, port availability checks, and more.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
-  "scripts": {
-    "test": "(tstest test/)",
-    "build": "(tsbuild --web --allowimplicitany)"
-  },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.69",
-    "@pushrocks/smartenv": "^5.0.0",
-    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^18.11.3"
+    "@git.zone/tsbuild": "^2.1.61",
+    "@git.zone/tsrun": "^1.2.39",
+    "@git.zone/tstest": "^1.0.69",
+    "@push.rocks/smartenv": "^5.0.0",
+    "@push.rocks/tapbundle": "^5.0.3",
+    "@types/node": "^22.15.3"
   },
   "dependencies": {
-    "@pushrocks/smartping": "^1.0.7",
-    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartstring": "^4.0.2",
-    "@types/default-gateway": "^3.0.1",
+    "@push.rocks/smartping": "^1.0.7",
+    "@push.rocks/smartpromise": "^4.2.3",
+    "@push.rocks/smartstring": "^4.0.2",
+    "@types/default-gateway": "^7.2.2",
     "isopen": "^1.3.0",
-    "public-ip": "^6.0.1",
+    "public-ip": "^7.0.1",
     "systeminformation": "^5.11.9"
   },
   "files": [
@@ -43,5 +39,30 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "keywords": [
+    "network diagnostics",
+    "ping",
+    "port check",
+    "speed test",
+    "network interface",
+    "public IP retrieval",
+    "Cloudflare speed test",
+    "network performance",
+    "network utility",
+    "TypeScript"
+  ],
+  "homepage": "https://code.foss.global/push.rocks/smartnetwork#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://code.foss.global/push.rocks/smartnetwork.git"
+  },
+  "bugs": {
+    "url": "https://code.foss.global/push.rocks/smartnetwork/issues"
+  },
+  "scripts": {
+    "test": "(tstest test/)",
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
+  }
 }

package/readme.hints.md

@@ -0,0 +1 @@
+