bake version info into bundle

src/@types/global.d.ts

@@ -0,0 +1,2 @@
+
+declare const POWFAUCET_VERSION: string;

src/app.ts

@@ -1,7 +1,7 @@
 import path, { dirname, basename } from "path";
 import { fileURLToPath } from "url";
 import { isMainThread, workerData } from "node:worker_threads";
-import { loadFaucetConfig, setAppBasePath } from "./config/FaucetConfig.js";
+import { faucetConfig, loadFaucetConfig, setAppBasePath } from "./config/FaucetConfig.js";
 import { FaucetWorkers } from "./common/FaucetWorker.js";
 import { EthWalletManager } from "./eth/EthWalletManager.js";
 import { FaucetHttpServer } from "./webserv/FaucetHttpServer.js";
@@ -20,13 +20,19 @@ import { FaucetStatus } from "./services/FaucetStatus.js";
   }
   else {
     try {
-      let importUrl = fileURLToPath(import.meta.url);
-      const __dirname = dirname(importUrl);
+      let srcfile: string;
+      if(typeof require !== "undefined") {
+        srcfile = require.main.filename;
+      } else {
+        srcfile = fileURLToPath(import.meta.url);
+      }
+      let basepath = path.join(dirname(srcfile), "..");
 
-      setAppBasePath(path.join(__dirname, ".."))
-      loadFaucetConfig()
+      setAppBasePath(basepath);
+      loadFaucetConfig();
+      ServiceManager.GetService(FaucetProcess).emitLog(FaucetLogLevel.INFO, "Initializing PoWFaucet v" + faucetConfig.faucetVersion + " (AppBasePath: " + faucetConfig.appBasePath + ", InternalBasePath: " + basepath + ")");
       ServiceManager.GetService(FaucetProcess).initialize();
-      ServiceManager.GetService(FaucetWorkers).initialize(importUrl);
+      ServiceManager.GetService(FaucetWorkers).initialize(srcfile);
       ServiceManager.GetService(FaucetStatus).initialize();
       ServiceManager.GetService(FaucetStatsLog).initialize();
       await ServiceManager.GetService(FaucetDatabase).initialize();

src/config/FaucetConfig.ts

@@ -25,7 +25,6 @@ let cliArgs = (function() {
 })();
 
 
-let packageJson = JSON.parse(fs.readFileSync(path.join(".", "package.json"), 'utf8'));
 let internalBasePath = path.join(".");
 let basePath: string;
 if(cliArgs['datadir']) {
@@ -56,7 +55,14 @@ export function setAppBasePath(basePath: string) {
 export function loadFaucetConfig(loadDefaultsOnly?: boolean) {
   let config: IConfigSchema;
   let configFile = faucetConfigFile;
-  debugger;
+
+  let faucetVersion: string;
+  if(typeof POWFAUCET_VERSION !== "undefined") {
+    faucetVersion = POWFAUCET_VERSION;
+  } else {
+    let packageJson = JSON.parse(fs.readFileSync(path.join(internalBasePath, "package.json"), 'utf8'));
+    faucetVersion = packageJson.version;
+  }
 
   if(!fs.existsSync(configFile) && !loadDefaultsOnly) {
     // create copy of faucet-config.example.yml
@@ -103,7 +109,7 @@ export function loadFaucetConfig(loadDefaultsOnly?: boolean) {
     faucetConfig = {} as any;
   Object.assign(faucetConfig, getDefaultConfig(), config, {
     appBasePath: basePath,
-    faucetVersion: packageJson.version,
+    faucetVersion: faucetVersion,
   } as any);
 }
 

tsconfig.json

@@ -11,6 +11,7 @@
   },
   "lib": ["es2015"],
   "include": [
+    "src/@types",
     "src/app.ts",
     "src/tools/migrateDB.ts"
   ],

webpack.config.js

@@ -1,9 +1,12 @@
-import path, { dirname } from 'path'
+import path, { dirname } from 'path';
+import fs from 'fs';
 import { fileURLToPath } from "url";
 import webpack from "webpack";
 
 let importUrl = fileURLToPath(import.meta.url);
-const __dirname = dirname(importUrl);
+const basedir = dirname(importUrl);
+
+let packageJson = JSON.parse(fs.readFileSync(path.join(basedir, "package.json"), 'utf8'));
 
 export default {
   entry: './dist/app.js',
@@ -13,11 +16,14 @@ export default {
   },
   output: {
     filename: 'powfaucet.cjs',
-    path: path.resolve(__dirname, 'bundle'),
+    path: path.resolve(basedir, 'bundle'),
   },
   plugins: [
     new webpack.optimize.LimitChunkCountPlugin({
       maxChunks: 1,
     }),
+    new webpack.DefinePlugin({
+      POWFAUCET_VERSION: JSON.stringify(packageJson.version),
+    }),
   ],
 };