my-timezone 1.5.5 → 1.6.0

package/README.md

@@ -9,7 +9,7 @@ Get the exact time based on your location by calculating the time difference in
 
 ## 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.
+ℹ️ This is a pure [ESM](https://nodejs.org/api/esm.html#introduction) module.
 
 Add the module to your project with `yarn add my-timezone` or install it globally with `yarn global add my-timezone`.
 

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

@@ -1,9 +1,13 @@
 #!/usr/bin/env node
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { program as commander } from 'commander';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
 import { MyTimezone } from './MyTimezone.js';
-const { bin, description, version } = require('../package.json');
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const packageJsonPath = path.join(__dirname, '../package.json');
+const { bin, description, version } = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
 commander
     .name(Object.keys(bin)[0])
     .version(version)

package/package.json

@@ -1,46 +1,37 @@
 {
   "author": "Florian Imdahl <git@ffflorian.de>",
-  "bin": "dist/cjs/cli.js",
+  "bin": "dist/cli.js",
   "dependencies": {
-    "axios": "1.7.2",
+    "axios": "1.7.3",
     "commander": "12.1.0",
-    "ntpclient": "1.6.5"
+    "ntpclient": "1.7.0"
   },
   "description": "Get the exact time based on your location.",
   "devDependencies": {
     "nock": "13.5.4",
-    "rimraf": "5.0.7",
-    "typescript": "5.5.2",
-    "vitest": "1.6.0"
+    "rimraf": "6.0.1",
+    "typescript": "5.5.4",
+    "vitest": "2.0.5"
   },
   "engines": {
     "node": ">= 18.0"
   },
-  "exports": {
-    ".": {
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
-    }
-  },
+  "exports": "./dist/index.js",
   "files": [
     "dist"
   ],
   "license": "GPL-3.0",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "module": "dist/index.js",
   "name": "my-timezone",
   "repository": "https://github.com/ffflorian/node-packages/tree/main/packages/my-timezone",
   "scripts": {
-    "build": "yarn build:cjs && yarn build:esm && yarn generate:packagejson",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.json",
     "clean": "rimraf dist",
     "dist": "yarn clean && yarn build",
-    "generate:packagejson": "../../bin/generate-hybrid-package-json.sh",
     "start": "node --loader ts-node/esm src/cli.ts",
     "test": "vitest run"
   },
   "type": "module",
-  "version": "1.5.5",
-  "gitHead": "f7a6a79286e4eb85392b5f2d33942ab166142109"
+  "version": "1.6.0",
+  "gitHead": "f1a74d8ec9721d5b52a00e41b2ec73278e048290"
 }

package/dist/cjs/package.json

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

package/dist/esm/MyTimezone.d.ts

@@ -1,49 +0,0 @@
-export declare enum DIRECTION {
-    EAST = "E",
-    WEST = "W"
-}
-export interface CustomDate {
-    day: string;
-    hours: string;
-    minutes: string;
-    month: string;
-    seconds: string;
-    year: string;
-}
-export interface OSMResult {
-    boundingbox?: string[] | null;
-    class: string;
-    display_name: string;
-    icon?: string | null;
-    importance: number;
-    lat: string;
-    licence: string;
-    lon: string;
-    osm_id: number;
-    osm_type: string;
-    place_id: number;
-    type: string;
-}
-export interface MyTimezoneConfig {
-    ntpServer?: string;
-    offline?: boolean;
-}
-export interface Coordinates {
-    longitude: number;
-}
-export interface Location extends Coordinates {
-    formattedAddress?: string;
-}
-export declare class MyTimezone {
-    private readonly config;
-    private readonly ntpClient;
-    constructor(config?: MyTimezoneConfig);
-    getLocation(location: string): Promise<Location>;
-    getLocationByName(address: string, radius?: string): Promise<Location>;
-    getDateByAddress(address: string): Promise<Date>;
-    getDateByLongitude(longitude: number): Promise<Date>;
-    parseCoordinates(coordinates: string): Coordinates;
-    parseDate(date: Date): CustomDate;
-    private getOffsetMillis;
-    private getUTCDate;
-}

package/dist/esm/MyTimezone.js

@@ -1,114 +0,0 @@
-import axios from 'axios';
-import { NTPClient } from 'ntpclient';
-export var DIRECTION;
-(function (DIRECTION) {
-    DIRECTION["EAST"] = "E";
-    DIRECTION["WEST"] = "W";
-})(DIRECTION || (DIRECTION = {}));
-const defaultConfig = {
-    ntpServer: 'pool.ntp.org',
-    offline: false,
-};
-const nominatimAPI = 'https://nominatim.openstreetmap.org';
-export class MyTimezone {
-    constructor(config) {
-        this.config = {
-            ...defaultConfig,
-            ...config,
-        };
-        this.ntpClient = new NTPClient(this.config.ntpServer);
-    }
-    async getLocation(location) {
-        try {
-            const coordinates = this.parseCoordinates(location);
-            return coordinates;
-        }
-        catch (error) {
-            if (error.message.includes('No coordinates parsed')) {
-                return this.getLocationByName(location);
-            }
-            throw error;
-        }
-    }
-    async getLocationByName(address, radius) {
-        const requestConfig = {
-            method: 'get',
-            params: {
-                format: 'json',
-                limit: 9,
-                // eslint-disable-next-line id-length
-                q: address,
-            },
-            url: `${nominatimAPI}/search`,
-        };
-        if (radius) {
-            requestConfig.params.radius = radius;
-        }
-        let results;
-        try {
-            const response = await axios.request(requestConfig);
-            results = response.data;
-        }
-        catch (error) {
-            throw new Error(`Nominatim API Error: ${error.message}`);
-        }
-        if (!results.length) {
-            throw new Error('No place found.');
-        }
-        const { display_name, lon } = results[0];
-        const parsedLongitude = parseFloat(lon);
-        return {
-            formattedAddress: display_name,
-            longitude: parsedLongitude,
-        };
-    }
-    async getDateByAddress(address) {
-        const { longitude } = await this.getLocationByName(address);
-        return this.getDateByLongitude(longitude);
-    }
-    async getDateByLongitude(longitude) {
-        const direction = longitude < 0 ? DIRECTION.WEST : DIRECTION.EAST;
-        const utcDate = await this.getUTCDate();
-        const offsetMillis = this.getOffsetMillis(longitude, direction);
-        const calculatedDate = direction === DIRECTION.EAST
-            ? new Date(utcDate.getTime() + offsetMillis)
-            : new Date(utcDate.getTime() - offsetMillis);
-        return calculatedDate;
-    }
-    parseCoordinates(coordinates) {
-        var _a;
-        const longitudeRegex = new RegExp('[-?\\W\\d\\.]+,(?<longitude>[-?\\W\\d\\.]+)');
-        const parsedRegex = longitudeRegex.exec(coordinates);
-        if ((_a = parsedRegex === null || parsedRegex === void 0 ? void 0 : parsedRegex.groups) === null || _a === void 0 ? void 0 : _a.longitude) {
-            try {
-                const longitude = parseFloat(parsedRegex.groups.longitude);
-                return { longitude };
-            }
-            catch (error) {
-                throw new Error(`Invalid coordinates: "${coordinates}"`);
-            }
-        }
-        throw new Error(`No coordinates parsed: "${coordinates}"`);
-    }
-    parseDate(date) {
-        const isoString = date.toISOString();
-        const dateRegex = /(?<year>\d{4})-(?<month>\d{2})-(?<day>\d{2})T(?<hours>\d{2}):(?<minutes>\d{2}):(?<seconds>\d{2})/g;
-        const parsedString = dateRegex.exec(isoString);
-        if (!(parsedString === null || parsedString === void 0 ? void 0 : parsedString.groups)) {
-            throw new Error('Could not parse date');
-        }
-        const { year, month, day, hours, minutes, seconds } = parsedString.groups;
-        return { day, hours, minutes, month, seconds, year };
-    }
-    getOffsetMillis(longitudeDegrees, direction) {
-        const oneHourInMillis = 3600000;
-        const dayInHours = 24;
-        const degreesOnEarth = 360;
-        const dir = direction === DIRECTION.EAST ? 1 : -1;
-        const offsetHours = (dir * longitudeDegrees * dayInHours) / degreesOnEarth;
-        return offsetHours * oneHourInMillis;
-    }
-    async getUTCDate() {
-        return this.config.offline ? new Date() : this.ntpClient.getNetworkTime();
-    }
-}

package/dist/esm/MyTimezone.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/esm/MyTimezone.test.js

@@ -1,60 +0,0 @@
-/* eslint-disable no-magic-numbers */
-import { expect, describe, test, vi } from 'vitest';
-import nock from 'nock';
-import { MyTimezone } from './MyTimezone.js';
-vi.setConfig({
-    testTimeout: 10 * 1000, // 10 seconds
-});
-const nominatimAPI = 'https://nominatim.openstreetmap.org';
-describe('MyTimezone', () => {
-    const tz = new MyTimezone({
-        offline: true,
-    });
-    let formatted_address;
-    nock(nominatimAPI)
-        .get('/search')
-        .query(queryObject => {
-        formatted_address = queryObject.q;
-        return true;
-    })
-        .reply(() => [
-        200,
-        [
-            {
-                boundingbox: ['52.3570365', '52.6770365', '13.2288599', '13.5488599'],
-                class: 'place',
-                display_name: formatted_address,
-                icon: 'https://nominatim.openstreetmap.org/images/mapicons/poi_place_city.p.20.png',
-                importance: 1.007539028249136,
-                lat: '52.5170365',
-                licence: 'Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright',
-                lon: '13.3888599',
-                osm_id: 240109189,
-                osm_type: 'node',
-                place_id: 595794,
-                type: 'city',
-            },
-        ],
-    ])
-        .persist();
-    test('returns an address from Nominatim', async () => {
-        const location = 'Berlin, Germany';
-        const { formattedAddress } = await tz.getLocationByName(location);
-        expect(formattedAddress).toBe(location);
-    });
-    test('returns the correct time for a location', async () => {
-        const berlinTime = await tz.getDateByLongitude(13.40803);
-        //console.log('Timezone at 52.51848, 13.40803:', berlinTime.toString());
-        const frankfurtTime = await tz.getDateByLongitude(8.67931);
-        //console.log('Timezone at 50.11796, 8.67931:', frankfurtTime.toString());
-        expect(frankfurtTime.getTime() < berlinTime.getTime()).toBe(true);
-    });
-    test('returns the time for an address', async () => {
-        const dataBerlin = await tz.getDateByAddress('Berlin, Germany');
-        expect(dataBerlin).toBeDefined();
-        //console.log('Timezone Berlin:', dataBerlin.toString());
-        const dataMinsk = await tz.getDateByAddress('Minsk, Belarus');
-        expect(dataMinsk).toBeDefined();
-        //console.log('Timezone Minsk:', dataMinsk.toString());
-    });
-});

package/dist/esm/cli.d.ts

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

package/dist/esm/cli.js

@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-import { program as commander } from 'commander';
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-import { MyTimezone } from './MyTimezone.js';
-const { bin, description, version } = require('../package.json');
-commander
-    .name(Object.keys(bin)[0])
-    .version(version)
-    .description(`${description}\nUse a city name or longitude value as location.`)
-    .option('-o, --offline', 'Work offline (default is false)')
-    .option('-s, --server <server>', 'Specify the NTP server (default is "pool.ntp.org")')
-    .argument('<location>')
-    .parse(process.argv);
-if (!commander.args || !commander.args.length) {
-    console.error('Error: No location specified.');
-    commander.help();
-}
-const location = commander.args[0];
-const myTimezone = new MyTimezone({
-    ntpServer: commander.opts().server,
-    offline: !!commander.opts().offline,
-});
-void (async () => {
-    try {
-        const { longitude } = await myTimezone.getLocation(location);
-        const date = await myTimezone.getDateByLongitude(longitude);
-        const parsedDate = myTimezone.parseDate(date);
-        const formattedDate = `${parsedDate.year}-${parsedDate.month}-${parsedDate.day}`;
-        const formattedTime = `${parsedDate.hours}:${parsedDate.minutes}:${parsedDate.seconds}`;
-        console.info(`Custom time zone in "${location}" (longitude: ${longitude}): ${formattedDate} ${formattedTime}`);
-        process.exit();
-    }
-    catch (error) {
-        console.error(error.message);
-        process.exit(1);
-    }
-})();

package/dist/esm/index.d.ts

@@ -1 +0,0 @@
-export * from './MyTimezone.js';

package/dist/esm/index.js

@@ -1 +0,0 @@
-export * from './MyTimezone.js';

package/dist/esm/package.json

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