hfbcast 1.0.2 → 1.0.8-lib7

package/package.json

@@ -1,30 +1,73 @@
 {
-   "name": "hfbcast",
-   "version": "1.0.2",
-   "description": "",
-   "exports": {
-      ".": {
-         "import": "./src/index.js",
-         "node": "./src/index.js"
-      }
-   },
-   "types": "./src/index.d.ts",
-   "dependencies": {
-      "file-loader": "^6.2.0",
-      "html-webpack-plugin": "^5.5.0",
-      "jquery": "^3.6.1",
-      "pako": "^2.0.4",
-      "raw-loader": "^0.1.5",
-      "sql.js": "^1.7.0",
-      "url-loader": "^4.1.1"
-   },
-   "devDependencies": {
-      "webpack": "^5.75.0",
-      "webpack-cli": "^4.10.0",
-      "webpack-dev-server": "^4.15.1"
-   },
-   "scripts": {
-      "dev": "webpack serve",
-      "build": "webpack"
-   }
+  "name": "hfbcast",
+  "version": "1.0.8-lib7",
+  "description": "",
+  "main": "./index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.sys/FRA/df-hfbcast.git"
+  },
+  "bin": {
+    "@fra/df-hfbcast": "server.js",
+    "df-hfbcast-runserver": "server.js",
+    "df-hfbcast-test": "test/runTests.js"
+  },
+  "files": [
+    "src",
+    "dist",
+    "doc",
+    "server.js",
+    "index.js",
+    "assets",
+    "commithash.json"
+  ],
+  "scripts": {
+    "build": "webpack",
+    "build:db": "cd sqlite && npm install && npm run build && gzip database.sqlite && mv database.sqlite.gz ../assets",
+    "dev": "webpack serve",
+    "devserve": "webpack serve --env server=start",
+    "serve": "nodemon server.js"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "cors": "^2.8.5",
+    "css-loader": "^7.1.2",
+    "express": "^4.19.1",
+    "http-proxy-middleware": "^2.0.6",
+    "jquery": "^3.7.0",
+    "log4js": "^6.9.1",
+    "pako": "^2.1.0",
+    "sql.js": "^1.10.2",
+    "style-loader": "^4.0.0",
+    "url-loader": "^4.1.1",
+    "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "ag-grid-community": "^32.2.2",
+    "dockerode": "^3.3.5",
+    "glob": "^11.0.0",
+    "html-webpack-plugin": "^5.6.0",
+    "jest": "^29.7.0",
+    "node-fetch": "2.6.5",
+    "nodemon": "^3.1.0",
+    "rimraf": "^6.0.1",
+    "shelljs": "^0.8.5",
+    "terser-webpack-plugin": "^5.3.10",
+    "webpack": "^5.91.0",
+    "webpack-bundle-analyzer": "^4.10.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "4.15.1"
+  },
+  "jobInfo": {
+    "doc": "1. build documentation",
+    "database": "2. build the database",
+    "package": "3. build and pack the application (needs 1 & 2)",
+    "test": "4. run tests (needs 3)",
+    "run": "5. run the package (needs 3)",
+    "publish": "6. publish the package (needs 3)",
+    "image": "7. build the application image (needs 3)",
+    "deploy": "8. deploy the application (needs 7)"
+  }
 }

package/server.js

@@ -0,0 +1,122 @@
+#!/usr/bin/env node
+
+const log4js = require("log4js");
+
+function server(config, silent) {
+
+    const express = require('express')
+    const path = require('path')
+    const cors = require('cors')
+    const app = express()
+
+    const logger = log4js.getLogger();
+    logger.level = silent ? 'fatal' : 'debug';
+
+    let resolver, rejecter;
+
+    app.use(express.json())
+    app.use(cors());
+    app.options('*', cors());
+
+    // //allowing for use of sharedArrayBuffers
+    // app.use((req, res, next) => {
+    //     res.setHeader("Cross-Origin-Opener-Policy", "same-origin"); 
+    //     // res.setHeader("Cross-Origin-Embedder-Policy", "same-origin"); 
+    //     next();
+    // })
+
+    //******************************
+    //     serve static content
+    //******************************
+
+    app.use(express.static(path.resolve(__dirname, 'dist')));
+    // app.use('/doc/mathjax', express.static(path.resolve(__dirname, 'lib/mathjax')));
+    app.use('/doc', express.static(path.resolve(__dirname, 'doc')));
+
+    //******************************
+    //          REST
+    //******************************
+
+    app.get('/api/v1/resource/:parameter', (req, res, next) => {
+        reqURL = new URL(req.url, 'http://' + req.headers.host + '/');
+
+
+        res.json({
+            parameter: req.params.parameter,
+            queryVar1: reqURL.searchParams.get('var1'),
+            queryVar2: reqURL.searchParams.get('var2'),
+        })
+    })
+
+    app.post('/api/v1/resource', (req, res, next) => {
+        res.json({requestBody: req.body});
+    })
+
+    //******************************
+    //          proxy
+    //******************************
+
+    const { createProxyMiddleware } = require('http-proxy-middleware');
+
+    app.use('/jsontest',
+        createProxyMiddleware({
+        target: 'http://echo.jsontest.com/',
+        changeOrigin: true,
+        pathRewrite: {
+            '^/jsontest':''
+        }
+        }),
+    );
+
+    //*********************************************************************
+    //     set up web sockets (all on the same port as the http server)
+    //*********************************************************************
+
+    const server = require('http').createServer();
+
+    server.on('request', app);
+
+    server.on('error', e => {
+        logger.info(e);
+        rejecter('server error');
+    });
+
+    server.listen(8080, () => {
+        logger.info('app server listening on http://localhost:8080')
+        resolver('server started');
+    })
+
+    return new Promise((resolve, reject) => {
+        resolver = resolve;
+        rejecter = reject;
+    });
+}
+
+const yargs = require('yargs')
+    .usage('npm start -- -c <config file> -s <silent>')
+    .options({
+        config: {
+            alias: 'c',
+            describe: 'config file',
+        },
+        silent: {
+            alias: 's',
+            describe: 'run without logging',
+        }
+    })
+    .argv;
+
+if (require.main === module) {
+    server(yargs.config ? require('./' + yargs.config) : {}, yargs.silent)
+    .then(message => {
+        console.log(message);
+    })
+    .catch(message => {
+        console.error(message);
+    });
+}
+
+module.exports = {
+    server
+};
+

package/src/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>hfbcast</title>
+    <!-- <link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-grid.css"> -->
+    <!-- <link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-theme-alpine.css"> -->
+    <!-- <script src="https://cdn.jsdelivr.net/npm/ag-grid-community/dist/ag-grid-community.min.js"></script> -->
+</head>
+<body>
+    <div id="myGrid" class="ag-theme-balham" style="height: 500px"></div>
+</body>
+</html>

package/src/index.js

@@ -1,84 +1,48 @@
-import dumm from "sql.js";
-import pako from "pako";
-import sqlwasm from 'url-loader!sql.js/dist/sql-wasm.wasm'
-import gzUrl from 'url-loader!../assets/database.sqlite.gz'
-// import gzUrl from "file-loader?name=database.sqlite.gz!../assets/database.sqlite.gz";
-
-async function openDb() {
-    return new Promise(resolve => {
-        fetch(sqlwasm).then(res => res.blob()).then(async blob => {
-            const sqlPromise = dumm({
-                locateFile: () => URL.createObjectURL(blob)
-            });
-            const dataPromise = fetch(gzUrl).then(res => res.arrayBuffer());
-            const [SQL, buf] = await Promise.all([sqlPromise, dataPromise])
-            const db = new SQL.Database(new Uint8Array(pako.ungzip(buf)));
-            resolve(db);
-        })
-    })
-}
-
-export class BroadcastDb {
-
-    constructor() {
-        return new Promise(async resolve => {
-            this.db = await openDb();
-            resolve(this)
-        })
-    }
-
-    getBroadcastsBetween(minFreqkHz, maxFreqkHz) {
-
-        const now = new Date();
-        const currentDay = now.getUTCDay();
-        const currentHour = now.getUTCHours();
-        const currentMinute = now.getUTCMinutes();
-        const currentTime = currentMinute + 60*currentHour;
-
-        const query = `SELECT * FROM broadcast 
-         JOIN site on broadcast.siteId = site.id 
-         WHERE broadcast.startTime <= ${currentTime} AND 
-           broadcast.endTime >= ${currentTime} AND 
-           NOT (site.lat = 0 AND site.lon = 0) AND
-         broadcast.days & (1 << ${currentDay}) != 0 AND
-         broadcast.frequency <= ${maxFreqkHz} AND
-         broadcast.frequency >= ${minFreqkHz}
-    `
-        const res = this.db.exec(query);
-
-        return res[0];
-    }
-
-    getBroadcastsAt(frequencyKHz, intervalKHz) {
-
-        const now = new Date();
-        const currentDay = now.getUTCDay();
-        const currentHour = now.getUTCHours();
-        const currentMinute = now.getUTCMinutes();
-        const currentTime = currentMinute + 60*currentHour;
-
-        const query = `SELECT * FROM broadcast 
-         JOIN site on broadcast.siteId = site.id 
-         WHERE broadcast.startTime <= ${currentTime} AND 
-               broadcast.endTime >= ${currentTime} AND 
-               NOT (site.lat = 0 AND site.lon = 0) AND
-             broadcast.days & (1 << ${currentDay}) != 0 AND
-             broadcast.frequency <= ${intervalKHz + frequencyKHz/1000} AND
-             broadcast.frequency >= ${-intervalKHz + frequencyKHz/1000}
-        `
-
-        const broadcasts = [];
-        const res = this.db.exec(query);
-        if (res.length > 0) {
-            res[0].values.forEach(c => {
-                const broadcast = {};
-                c.forEach((colvalue, i) => {
-                    broadcast[res[0].columns[i]] = colvalue;
-                })
-                broadcasts.push(broadcast);
-            })
-        }
-
-        return broadcasts;
-    }
-}
+import 'style-loader!css-loader!ag-grid-community/styles/ag-theme-balham.css';
+import 'style-loader!css-loader!ag-grid-community/styles/ag-grid.css';
+import {createGrid} from 'ag-grid-community';
+import {BroadcastDb} from './lib.js';
+import {commitHash} from '../commithash.json';
+// import {BroadcastDb, commitHash} from '../dist';
+
+
+console.log('COMMIT HASH', commitHash);
+
+(new BroadcastDb()).then(db => {
+    // Get and display build info
+    const buildInfo = db.getBuildInfo();
+    if (buildInfo) {
+        const buildInfoDiv = document.createElement('div');
+        buildInfoDiv.style.padding = '10px';
+        buildInfoDiv.style.backgroundColor = '#f0f0f0';
+        buildInfoDiv.style.marginBottom = '10px';
+        buildInfoDiv.style.fontFamily = 'monospace';
+        buildInfoDiv.innerHTML = `
+            <strong>Database Build Info:</strong><br>
+            Build Date: ${buildInfo.buildDate}<br>
+            Commit Hash: ${buildInfo.commitHash}
+        `;
+        document.body.insertBefore(buildInfoDiv, document.body.firstChild);
+        console.log('Database Build Info:', buildInfo);
+    }
+
+    const result = db.getBroadcastsBetween(0,30000);
+    // console.log(result.columns);
+    // console.log(result.values);
+
+    const useColumns = ['frequency', 'station', 'country', 'source', 'name', 'power', 'lon', 'lat'];
+    const useIndex = useColumns.map(name => result.columns.indexOf(name));
+
+    const gridOptions = {
+        rowData: result.values.map(row => useColumns.reduce((res, name, i) => { 
+            res[name] = row[useIndex[i]]; 
+            return res; 
+        },{})),
+        columnDefs: useColumns.map((name, i) => {return {field: name}}),
+    };
+    
+    const myGridElement = document.querySelector('#myGrid');
+    createGrid(myGridElement, gridOptions);
+
+});
+

package/src/lib.js

@@ -0,0 +1,133 @@
+const dumm = require("sql.js");
+const pako = require("pako");
+const sqlwasm = require("url-loader!sql.js/dist/sql-wasm.wasm").default;
+const gzUrl = require("url-loader!../assets/database.sqlite.gz").default;
+
+async function openDb() {
+    return new Promise(resolve => {
+        fetch(sqlwasm).then(res => res.blob()).then(async blob => {
+            const sqlPromise = dumm({
+                locateFile: () => URL.createObjectURL(blob)
+            });
+            const dataPromise = fetch(gzUrl).then(res => res.arrayBuffer());
+            const [SQL, buf] = await Promise.all([sqlPromise, dataPromise])
+            const db = new SQL.Database(new Uint8Array(pako.ungzip(buf)));
+            resolve(db);
+        })
+    })
+}
+
+class BroadcastDb {
+
+    constructor() {
+        return new Promise(async resolve => {
+            this.db = await openDb();
+            resolve(this)
+        })
+    }
+
+    getBroadcastsFromSites(station) {
+
+        const now = new Date();
+        const currentDay = now.getUTCDay();
+        const currentHour = now.getUTCHours();
+        const currentMinute = now.getUTCMinutes();
+        const currentTime = currentMinute + 60*currentHour;
+
+        const query = `SELECT * FROM broadcast 
+         JOIN site on broadcast.siteId = site.id 
+         WHERE broadcast.station LIKE '%${station}%'`
+        const res = this.db.exec(query);
+
+        return res[0];
+    }
+
+    getBroadcastsBetween(minFreqkHz, maxFreqkHz, startTm = new Date(), endTm = new Date()) {
+
+        //getUTCDay (Monday = 1, Tuesday = 2 ... Sunday = 0)
+        let startDay = endTm.getUTCDay()-1;
+        if (startDay === -1) {
+            startDay = 6;
+        }
+        const startHour = startTm.getUTCHours();
+        const startMinute = startTm.getUTCMinutes();
+        const startTime = startMinute + 60*startHour;
+
+        const endHour = endTm.getUTCHours();
+        const endMinute = endTm.getUTCMinutes();
+        const endTime = endMinute + 60*endHour;
+
+        const query = `SELECT * FROM broadcast 
+         JOIN site on broadcast.siteId = site.id 
+         WHERE broadcast.startTime <= ${endTime} AND 
+           broadcast.endTime > ${startTime} AND 
+           NOT (site.lat = 0 AND site.lon = 0) AND
+         broadcast.days & (1 << ${startDay}) != 0 AND
+         broadcast.frequency <= ${maxFreqkHz} AND
+         broadcast.frequency >= ${minFreqkHz}
+    `
+        const res = this.db.exec(query);
+
+        return res[0];
+    }
+
+
+    getBroadcastsAt(frequencyKHz, intervalKHz, startTm = new Date(), endTm = new Date()) {
+
+        //getUTCDay (Monday = 1, Tuesday = 2 ... Sunday = 0)
+        let currentDay = endTm.getUTCDay()-1;
+        if (currentDay === -1) {
+            currentDay = 6;
+        }
+        const startHour = startTm.getUTCHours();
+        const startMinute = startTm.getUTCMinutes();
+        const startTime = startMinute + 60*startHour;
+
+        const endHour = endTm.getUTCHours();
+        const endMinute = endTm.getUTCMinutes();
+        const endTime = endMinute + 60*endHour;
+
+        const query = `SELECT * FROM broadcast 
+         JOIN site on broadcast.siteId = site.id 
+         WHERE broadcast.startTime <= ${endTime} AND 
+               broadcast.endTime > ${startTime} AND 
+               NOT (site.lat = 0 AND site.lon = 0) AND
+             broadcast.days & (1 << ${currentDay}) != 0 AND
+             broadcast.frequency <= ${intervalKHz + frequencyKHz/1000} AND
+             broadcast.frequency >= ${-intervalKHz + frequencyKHz/1000}
+        `
+
+        const broadcasts = [];
+        const res = this.db.exec(query);
+        if (res.length > 0) {
+            res[0].values.forEach(c => {
+                const broadcast = {};
+                c.forEach((colvalue, i) => {
+                    broadcast[res[0].columns[i]] = colvalue;
+                })
+                broadcasts.push(broadcast);
+            })
+        }
+
+        return broadcasts;
+    }
+
+    getBuildInfo() {
+        const query = `SELECT * FROM build_info ORDER BY id DESC LIMIT 1`;
+        const res = this.db.exec(query);
+        
+        if (res.length > 0 && res[0].values.length > 0) {
+            const buildInfo = {};
+            res[0].values[0].forEach((colvalue, i) => {
+                buildInfo[res[0].columns[i]] = colvalue;
+            });
+            return buildInfo;
+        }
+        
+        return null;
+    }
+}
+
+module.exports = {
+    BroadcastDb    
+}

package/test/runTests.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+console.log('testing package hfbcast ...');
+
+// const jest = require("jest");
+// const path = require("path");
+
+// const options = {
+//   projects: [path.resolve(__dirname)],
+//   silent: false,
+// };
+
+// jest
+//   .runCLI(options, options.projects)
+//   .then((success) => {
+//     console.log(success.results.success ? 'PASSED!' : 'FAILED!');
+//     process.exit(success.results.success ? 0 : 1)
+//   })
+//   .catch((failure) => {
+//     console.error('COULD NOT RUN TESTS!');
+//     process.exit(1)
+//   });

package/.vscode/tasks.json

@@ -1,28 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-      {
-        "label": "publish package",
-        "type": "shell",
-        "command": "./scripts/local/publish.sh",
-        "windows": {
-          "command": ".\\scripts\\local\\publish.bat"
-        },
-        "group": "build native",
-        "presentation": {
-          "reveal": "always",
-          "panel": "new"
-        },
-        "problemMatcher": []
-      },
-      {
-        "type": "npm",
-        "script": "dev",
-        "problemMatcher": [],
-        "label": "npm: dev",
-        "detail": "webpack serve"
-      }
-    ]
-}