ntpclient 1.3.1 → 1.4.1

package/README.md

@@ -2,9 +2,16 @@
 
 TypeScript implementation of the NTP Client Protocol. Based on [node-ntp-client](https://github.com/moonpyk/node-ntp-client).
 
-## Usage
+## Prerequisites
 
-Add the module to your project with `yarn add ntpclient`.
+- [Node.js](https://nodejs.org) >= 14
+- npm (preinstalled) or [yarn](https://classic.yarnpkg.com) < 2
+
+## Installation
+
+ℹ️ This is a hybrid [CommonJS](https://nodejs.org/docs/latest/api/modules.html#modules-commonjs-modules) / [ESM](https://nodejs.org/api/esm.html#introduction) module.
+
+Run `yarn add ntpclient` or `npm i ntpclient`.
 
 ```ts
 import {NTPClient} from 'ntpclient';

package/{cli.js → dist/cjs/cli.js}

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,18 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const fs = require("fs");
-const path = require("path");
-const _1 = require("./");
-const defaultPackageJsonPath = path.join(__dirname, 'package.json');
-const packageJsonPath = fs.existsSync(defaultPackageJsonPath)
-    ? defaultPackageJsonPath
-    : path.join(__dirname, '../package.json');
-const packageJson = fs.readFileSync(packageJsonPath, 'utf-8');
-const { bin, description, version } = JSON.parse(packageJson);
-commander_1.program
+import { program as commander } from 'commander';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+import { NTPClient } from './index.js';
+const { bin, description, version } = require('../package.json');
+commander
     .name(Object.keys(bin)[0])
     .version(version)
     .description(description)
@@ -28,10 +21,10 @@ commander_1.program
     .option('-p, --port <number>', 'Specify a custom NTP port')
     .option('-t, --timeout <number>', 'Specify the timeout in milliseconds')
     .parse(process.argv);
-const commanderOptions = commander_1.program.opts();
+const commanderOptions = commander.opts();
 void (() => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const date = yield new _1.NTPClient(Object.assign(Object.assign(Object.assign({}, (commanderOptions.server && { server: commanderOptions.server })), (commanderOptions.port && { port: commanderOptions.port })), (commanderOptions.timeout && { replyTimeout: commanderOptions.timeout }))).getNetworkTime();
+        const date = yield new NTPClient(Object.assign(Object.assign(Object.assign({}, (commanderOptions.server && { server: commanderOptions.server })), (commanderOptions.port && { port: commanderOptions.port })), (commanderOptions.timeout && { replyTimeout: commanderOptions.timeout }))).getNetworkTime();
         console.info(date.toString());
         process.exit();
     }

package/dist/cjs/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;AAEA,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AAQrC,MAAM,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAC,GAAgB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE5E,SAAS;KACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACzB,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;KAC5D,MAAM,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;KAC1D,MAAM,CAAC,wBAAwB,EAAE,qCAAqC,CAAC;KACvE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;AAE1C,KAAK,CAAC,GAAS,EAAE;IACf,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,+CAC3B,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAC,CAAC,GAC9D,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAC,CAAC,GACxD,CAAC,gBAAgB,CAAC,OAAO,IAAI,EAAC,YAAY,EAAE,gBAAgB,CAAC,OAAO,EAAC,CAAC,EACzE,CAAC,cAAc,EAAE,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/{index.js → dist/cjs/index.js}

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NTPClient = void 0;
 /* eslint-disable no-magic-numbers */
-const dgram = require("dgram");
+import dgram from 'node:dgram';
 const TEN_SECONDS_IN_MILLIS = 10000;
 const defaultConfig = {
     port: 123,
     replyTimeout: TEN_SECONDS_IN_MILLIS,
     server: 'pool.ntp.org',
 };
-class NTPClient {
+export class NTPClient {
     constructor(configOrServer, port, replyTimeout) {
         this.config = defaultConfig;
         if (typeof configOrServer === 'string') {
@@ -93,5 +90,4 @@ class NTPClient {
         });
     }
 }
-exports.NTPClient = NTPClient;
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/cjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/dist/mjs/cli.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/mjs/cli.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+import { program as commander } from 'commander';
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+import { NTPClient } from './index.js';
+const { bin, description, version } = require('../package.json');
+commander
+    .name(Object.keys(bin)[0])
+    .version(version)
+    .description(description)
+    .option('-s, --server <host>', 'Specify a custom NTP server')
+    .option('-p, --port <number>', 'Specify a custom NTP port')
+    .option('-t, --timeout <number>', 'Specify the timeout in milliseconds')
+    .parse(process.argv);
+const commanderOptions = commander.opts();
+void (async () => {
+    try {
+        const date = await new NTPClient(Object.assign(Object.assign(Object.assign({}, (commanderOptions.server && { server: commanderOptions.server })), (commanderOptions.port && { port: commanderOptions.port })), (commanderOptions.timeout && { replyTimeout: commanderOptions.timeout }))).getNetworkTime();
+        console.info(date.toString());
+        process.exit();
+    }
+    catch (error) {
+        console.error(error);
+        process.exit(1);
+    }
+})();
+//# sourceMappingURL=cli.js.map

package/dist/mjs/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AAQrC,MAAM,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAC,GAAgB,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE5E,SAAS;KACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACzB,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;KAC5D,MAAM,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;KAC1D,MAAM,CAAC,wBAAwB,EAAE,qCAAqC,CAAC;KACvE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;AAE1C,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,SAAS,+CAC3B,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAC,CAAC,GAC9D,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAC,CAAC,GACxD,CAAC,gBAAgB,CAAC,OAAO,IAAI,EAAC,YAAY,EAAE,gBAAgB,CAAC,OAAO,EAAC,CAAC,EACzE,CAAC,cAAc,EAAE,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAC,EAAE,CAAC"}

package/dist/mjs/index.d.ts

@@ -0,0 +1,15 @@
+export interface NTPConfig {
+    /** Remote NTP Server port number */
+    port?: number;
+    /** Amount of acceptable time to await for a response from the remote server. */
+    replyTimeout?: number;
+    /** IP/Hostname of the remote NTP Server */
+    server?: string;
+}
+export declare class NTPClient {
+    private readonly config;
+    constructor(server?: string, port?: number, timeout?: number);
+    constructor(config?: NTPConfig);
+    /** Fetches the current NTP Time from the given server and port. */
+    getNetworkTime(ntpReplyTimeout?: number): Promise<Date>;
+}

package/dist/mjs/index.js

@@ -0,0 +1,93 @@
+/* eslint-disable no-magic-numbers */
+import dgram from 'node:dgram';
+const TEN_SECONDS_IN_MILLIS = 10000;
+const defaultConfig = {
+    port: 123,
+    replyTimeout: TEN_SECONDS_IN_MILLIS,
+    server: 'pool.ntp.org',
+};
+export class NTPClient {
+    constructor(configOrServer, port, replyTimeout) {
+        this.config = defaultConfig;
+        if (typeof configOrServer === 'string') {
+            this.config.server = configOrServer;
+        }
+        else {
+            this.config = Object.assign(Object.assign({}, this.config), configOrServer);
+        }
+        if (port) {
+            this.config.port = port;
+        }
+        if (replyTimeout) {
+            this.config.replyTimeout = replyTimeout;
+        }
+    }
+    /** Fetches the current NTP Time from the given server and port. */
+    getNetworkTime(ntpReplyTimeout) {
+        if (ntpReplyTimeout) {
+            this.config.replyTimeout = ntpReplyTimeout;
+        }
+        return new Promise((resolve, reject) => {
+            const client = dgram.createSocket('udp4');
+            const ntpData = Buffer.alloc(48);
+            // RFC 2030 -> LI = 0 (no warning, 2 bits), VN = 3 (IPv4 only, 3 bits), Mode = 3 (Client Mode, 3 bits) -> 1 byte
+            // -> rtol(LI, 6) ^ rotl(VN, 3) ^ rotl(Mode, 0)
+            // -> = 0x00 ^ 0x18 ^ 0x03
+            ntpData[0] = 0x1b;
+            const timeout = setTimeout(() => {
+                client.close();
+                reject(new Error('Timeout waiting for NTP response.'));
+                errorFired = true;
+            }, this.config.replyTimeout);
+            /*
+             * Some errors can happen before/after send() or cause send() to break.
+             * Some errors will also be given to send()
+             * NOTE: the error rejection is not generalised, as the client has to
+             * lose the connection also, apparently.
+             */
+            let errorFired = false;
+            client.on('error', err => {
+                if (errorFired) {
+                    return;
+                }
+                errorFired = true;
+                clearTimeout(timeout);
+                return reject(err);
+            });
+            client.send(ntpData, 0, ntpData.length, this.config.port, this.config.server, err => {
+                if (err) {
+                    if (errorFired) {
+                        return;
+                    }
+                    clearTimeout(timeout);
+                    errorFired = true;
+                    client.close();
+                    return reject(err);
+                }
+                client.once('message', msg => {
+                    clearTimeout(timeout);
+                    client.close();
+                    // Offset to get to the "Transmit Timestamp" field (time at which the reply
+                    // departed the server for the client, in 64-bit timestamp format.
+                    const offsetTransmitTime = 40;
+                    let intpart = 0;
+                    let fractpart = 0;
+                    // Get the seconds part
+                    for (let index = 0; index <= 3; index++) {
+                        intpart = 256 * intpart + msg[offsetTransmitTime + index];
+                    }
+                    // Get the seconds fraction
+                    for (let index = 4; index <= 7; index++) {
+                        fractpart = 256 * fractpart + msg[offsetTransmitTime + index];
+                    }
+                    const milliseconds = intpart * 1000 + (fractpart * 1000) / 4294967296;
+                    // **UTC** time
+                    const date = new Date('Jan 01 1900 GMT');
+                    date.setUTCMilliseconds(date.getUTCMilliseconds() + milliseconds);
+                    return resolve(date);
+                });
+            });
+        });
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/mjs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/mjs/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "author": "Florian Imdahl <git@ffflorian.de>",
   "bin": {
-    "ntpclient": "cli.js"
+    "ntpclient": "dist/cjs/cli.js"
   },
   "dependencies": {
-    "commander": "10.0.0"
+    "commander": "10.0.1"
   },
   "description": "A TypeScript implementation of the NTP Client Protocol",
   "devDependencies": {
@@ -12,32 +12,34 @@
     "typescript": "5.0.4"
   },
   "engines": {
-    "node": ">= 10.9"
+    "node": ">= 14.16"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/mjs/index.js",
+      "require": "./dist/cjs/index.js"
+    }
   },
   "files": [
-    "cli.d.ts",
-    "cli.js",
-    "cli.js.map",
-    "index.d.ts",
-    "index.js",
-    "index.js.map",
+    "dist",
     "src"
   ],
   "license": "GPL-3.0",
-  "main": "index.js",
+  "main": "dist/cjs/index.js",
+  "module": "dist/mjs/index.js",
   "name": "ntpclient",
-  "publishConfig": {
-    "directory": "flattened"
-  },
   "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/ntpclient",
   "scripts": {
-    "build": "tsc",
+    "build": "yarn build:cjs && yarn build:mjs && yarn generate:packagejson",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:mjs": "tsc -p tsconfig.json",
     "clean": "rimraf dist",
     "dist": "yarn clean && yarn build",
-    "flatten": "node ../publish-flat/dist/cli.js -o flattened",
-    "postversion": "node ../publish-flat/dist/cli-copy.js -o flattened/package.json version",
-    "start": "ts-node src/cli.ts",
-    "test": "ts-node -P tsconfig.jasmine.json ../../node_modules/.bin/jasmine"
+    "generate:packagejson": "../../bin/generate-hybrid-package-json.sh",
+    "start": "ts-node-esm src/cli.ts",
+    "test": "ts-node-esm -P tsconfig.jasmine.json ../../node_modules/.bin/jasmine"
   },
-  "version": "1.3.1"
+  "type": "module",
+  "version": "1.4.1",
+  "gitHead": "fee6dde4396255259028c1c723a95b9f6ec5b281"
 }

package/src/cli.ts

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 
 import {program as commander} from 'commander';
-import * as fs from 'fs';
-import * as path from 'path';
+import {createRequire} from 'node:module';
+const require = createRequire(import.meta.url);
 
-import {NTPClient} from './';
+import {NTPClient} from './index.js';
 
-const defaultPackageJsonPath = path.join(__dirname, 'package.json');
-const packageJsonPath = fs.existsSync(defaultPackageJsonPath)
-  ? defaultPackageJsonPath
-  : path.join(__dirname, '../package.json');
+interface PackageJson {
+  bin: Record<string, string>;
+  description: string;
+  version: string;
+}
 
-const packageJson = fs.readFileSync(packageJsonPath, 'utf-8');
-const {bin, description, version} = JSON.parse(packageJson);
+const {bin, description, version}: PackageJson = require('../package.json');
 
 commander
   .name(Object.keys(bin)[0])

package/src/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-magic-numbers */
-import * as dgram from 'dgram';
+import dgram from 'node:dgram';
 
 const TEN_SECONDS_IN_MILLIS = 10_000;
 

package/cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAA+C;AAC/C,yBAAyB;AACzB,6BAA6B;AAE7B,yBAA6B;AAE7B,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACpE,MAAM,eAAe,GAAG,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC;IAC3D,CAAC,CAAC,sBAAsB;IACxB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;AAE5C,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AAC9D,MAAM,EAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;AAE5D,mBAAS;KACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACzB,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;KAC5D,MAAM,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;KAC1D,MAAM,CAAC,wBAAwB,EAAE,qCAAqC,CAAC;KACvE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvB,MAAM,gBAAgB,GAAG,mBAAS,CAAC,IAAI,EAAE,CAAC;AAE1C,KAAK,CAAC,GAAS,EAAE;IACf,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,IAAI,YAAS,+CAC3B,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAC,CAAC,GAC9D,CAAC,gBAAgB,CAAC,IAAI,IAAI,EAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAC,CAAC,GACxD,CAAC,gBAAgB,CAAC,OAAO,IAAI,EAAC,YAAY,EAAE,gBAAgB,CAAC,OAAO,EAAC,CAAC,EACzE,CAAC,cAAc,EAAE,CAAC;QAEpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}