@koeroesi86/node-webserver-service 22.3.25-9a65a76 → 26.10.37633705232-master

package/README.md

@@ -1,4 +1,4 @@
-# node-webserver-service [![Build Status](https://travis-ci.com/Koeroesi86/node-webserver-service.svg?branch=master)](https://travis-ci.com/Koeroesi86/node-webserver-service)
+# @koeroesi86/node-webserver-service
 
 OS service integration for @koeroesi86/node-webserver
 
@@ -6,7 +6,6 @@ This package brings ability to deploy webapps a lot easier. Just copy [configura
 
 ### Dependencies to run
 * [NodeJS](https://nodejs.org/en/)
-* [Yarn](https://yarnpkg.com/en/)
 * For Windows usage
     1. [Python](https://www.python.org/)
     1. [Visual C++ Build Tools](https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017)
@@ -22,13 +21,13 @@ This package brings ability to deploy webapps a lot easier. Just copy [configura
 ### Usage
 
 ```shell script
-yarn add @koeroesi86/node-webserver-service
+npm install @koeroesi86/node-webserver-service
 ```
 
 Please enter in a console/terminal:
 
 ```shell script
-yarn nws-service [argument]
+npx nws-service [argument]
 
 arguments:
     --add      Installs the service

package/configuration.example.js

@@ -0,0 +1,30 @@
+const path = require('path');
+
+process.chdir(__dirname);
+
+module.exports = {
+  serviceName: 'node-webserver',
+  serviceDisplayName: 'NodeJS Webserver',
+  // fileLogPath: path.resolve(__dirname, './.logs/'),
+  fileLogPath: null,
+  logLevels: {
+    system: true,
+    info: true,
+    success: true,
+    error: true,
+    warning: true,
+  },
+  // portHttp: 80,
+  // portHttps: 443,
+  // portLookup: {
+  //   from: 3000,
+  //   to: 3010,
+  //   address: 'localhost'
+  // },
+  portLookup: false,
+  statsDomain: 'stats.localhost', // set to false to disable
+  statsRefreshInterval: 10000,
+  servers: [
+    path.resolve('./examples/serverConfig.js'),
+  ]
+};

package/dist/constants/index.d.ts

@@ -0,0 +1,3 @@
+/** folder of the package, both from src/ and dist/ */
+export declare const PACKAGE_ROOT: string;
+export declare const DEFAULT_CONFIGURATION_PATH: string;

package/dist/constants/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_CONFIGURATION_PATH = exports.PACKAGE_ROOT = void 0;
+const path_1 = require("path");
+/** folder of the package, both from src/ and dist/ */
+exports.PACKAGE_ROOT = (0, path_1.resolve)(__dirname, '../..');
+exports.DEFAULT_CONFIGURATION_PATH = (0, path_1.resolve)(exports.PACKAGE_ROOT, 'configuration.example.js');
+//# sourceMappingURL=index.js.map

package/dist/constants/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/constants/index.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B,sDAAsD;AACzC,QAAA,YAAY,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAE3C,QAAA,0BAA0B,GAAG,IAAA,cAAO,EAAC,oBAAY,EAAE,0BAA0B,CAAC,CAAC"}

package/dist/scripts/manageService.d.ts

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

package/dist/scripts/manageService.js

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_service_1 = __importDefault(require("os-service"));
+const fs_1 = require("fs");
+const parseArgv_1 = __importDefault(require("../utils/parseArgv"));
+const start_1 = __importDefault(require("../utils/start"));
+const constants_1 = require("../constants");
+const { add, remove, run, configuration } = (0, parseArgv_1.default)();
+const configPath = (typeof configuration === 'string' && configuration) || process.env.NODE_WEBSERVER_CONFIG || constants_1.DEFAULT_CONFIGURATION_PATH;
+if (!(0, fs_1.existsSync)(configPath)) {
+    throw new Error(`Configuration file does not exist: ${configPath}`);
+}
+const Configuration = require(configPath);
+const handleError = (error) => {
+    if (error) {
+        console.trace(error);
+    }
+};
+if (add) {
+    os_service_1.default.add(Configuration.serviceName, {
+        displayName: Configuration.serviceDisplayName || Configuration.serviceName,
+        programPath: __filename,
+        programArgs: ['--run', ...process.argv.slice(3)],
+    }, handleError);
+}
+else if (remove) {
+    os_service_1.default.remove(Configuration.serviceName, handleError);
+}
+else if (run) {
+    (0, start_1.default)(configPath);
+    os_service_1.default.run(() => {
+        os_service_1.default.stop(0);
+    });
+}
+else {
+    console.info('\x1b[32m%s\x1b[0m', `
+    Usage:
+    
+    pnpm run service [argument]
+    
+    arguments:
+        --add      Installs the service
+        --remove   Removes the service
+        --run      Attempt to run the program as a service
+    `);
+}
+//# sourceMappingURL=manageService.js.map

package/dist/scripts/manageService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"manageService.js","sourceRoot":"","sources":["../../src/scripts/manageService.ts"],"names":[],"mappings":";;;;;;AAEA,4DAAiC;AACjC,2BAAgC;AAChC,mEAA2C;AAC3C,2DAAmC;AACnC,4CAA0D;AAG1D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,mBAAS,GAAE,CAAC;AAExD,MAAM,UAAU,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,sCAA0B,CAAC;AAE3I,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;IAC5B,MAAM,IAAI,KAAK,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,aAAa,GAAyB,OAAO,CAAC,UAAU,CAAC,CAAC;AAEhE,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;IAC1C,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAC;AAEF,IAAI,GAAG,EAAE,CAAC;IACR,oBAAO,CAAC,GAAG,CACT,aAAa,CAAC,WAAW,EACzB;QACE,WAAW,EAAE,aAAa,CAAC,kBAAkB,IAAI,aAAa,CAAC,WAAW;QAC1E,WAAW,EAAE,UAAU;QACvB,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACjD,EACD,WAAW,CACZ,CAAC;AACJ,CAAC;KAAM,IAAI,MAAM,EAAE,CAAC;IAClB,oBAAO,CAAC,MAAM,CAAC,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AACzD,CAAC;KAAM,IAAI,GAAG,EAAE,CAAC;IACf,IAAA,eAAK,EAAC,UAAU,CAAC,CAAC;IAClB,oBAAO,CAAC,GAAG,CAAC,GAAG,EAAE;QACf,oBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;KAAM,CAAC;IACN,OAAO,CAAC,IAAI,CACV,mBAAmB,EACnB;;;;;;;;;KASC,CACF,CAAC;AACJ,CAAC"}

package/dist/scripts/start.d.ts

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

package/dist/scripts/start.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const parseArgv_1 = __importDefault(require("../utils/parseArgv"));
+const start_1 = __importDefault(require("../utils/start"));
+const constants_1 = require("../constants");
+const { configuration } = (0, parseArgv_1.default)();
+const configPath = (typeof configuration === 'string' && configuration) || process.env.NODE_WEBSERVER_CONFIG || constants_1.DEFAULT_CONFIGURATION_PATH;
+if (!(0, fs_1.existsSync)(configPath)) {
+    (0, fs_1.copyFileSync)(constants_1.DEFAULT_CONFIGURATION_PATH, configPath);
+}
+(0, start_1.default)(configPath);
+//# sourceMappingURL=start.js.map

package/dist/scripts/start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/scripts/start.ts"],"names":[],"mappings":";;;;;AAAA,2BAA8C;AAC9C,mEAA2C;AAC3C,2DAAmC;AACnC,4CAA0D;AAE1D,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,mBAAS,GAAE,CAAC;AAEtC,MAAM,UAAU,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,sCAA0B,CAAC;AAE3I,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;IAC5B,IAAA,iBAAY,EAAC,sCAA0B,EAAE,UAAU,CAAC,CAAC;AACvD,CAAC;AAED,IAAA,eAAK,EAAC,UAAU,CAAC,CAAC"}

package/dist/types.d.ts

@@ -0,0 +1,5 @@
+/** what the service integration needs from the configuration, on top of the web server options */
+export interface ServiceConfiguration {
+    serviceName: string;
+    serviceDisplayName?: string;
+}

package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/dist/utils/parseArgv.d.ts

@@ -0,0 +1,5 @@
+export interface ParsedArgv {
+    [key: string]: string | boolean | undefined;
+}
+declare function parseArgv(argv?: string[]): ParsedArgv;
+export default parseArgv;

package/dist/utils/parseArgv.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ARGUMENT_PATTERN = /[-]{1,2}([a-zA-Z0-9-]+)[=]?["']?([a-zA-Z0-9/\\.\-:]+)*["']?/;
+const VALUE_PATTERN = /["']?([a-zA-Z0-9/\\.\-:]+)*["']?/;
+function parseArgv(argv = process.argv) {
+    let skipNext = false;
+    return argv.reduce((result, current, index) => {
+        if (index < 2) {
+            result[index] = current;
+            return result;
+        }
+        if (current.indexOf('-') !== 0) {
+            return result;
+        }
+        if (skipNext) {
+            skipNext = false;
+            return result;
+        }
+        const matches = current.match(ARGUMENT_PATTERN);
+        if (!matches) {
+            return result;
+        }
+        const [, key, inlineValue] = matches;
+        result[key] = inlineValue || true;
+        const nextArgument = argv[index + 1];
+        if (inlineValue || !nextArgument || nextArgument.indexOf('-') === 0) {
+            return result;
+        }
+        // handle spaces
+        skipNext = true;
+        result[key] = nextArgument.match(VALUE_PATTERN)?.[1];
+        return result;
+    }, {});
+}
+exports.default = parseArgv;
+//# sourceMappingURL=parseArgv.js.map

package/dist/utils/parseArgv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseArgv.js","sourceRoot":"","sources":["../../src/utils/parseArgv.ts"],"names":[],"mappings":";;AAIA,MAAM,gBAAgB,GAAG,6DAA6D,CAAC;AACvF,MAAM,aAAa,GAAG,kCAAkC,CAAC;AAEzD,SAAS,SAAS,CAAC,OAAiB,OAAO,CAAC,IAAI;IAC9C,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,OAAO,IAAI,CAAC,MAAM,CAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACxD,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;YACxB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,GAAG,KAAK,CAAC;YACjB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,IAAI,IAAI,CAAC;QAElC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAErC,IAAI,WAAW,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,gBAAgB;QAChB,QAAQ,GAAG,IAAI,CAAC;QAChB,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,kBAAe,SAAS,CAAC"}

package/dist/utils/start.d.ts

@@ -0,0 +1,2 @@
+declare const start: (configPath: string) => void;
+export default start;

package/dist/utils/start.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_webserver_1 = __importDefault(require("@koeroesi86/node-webserver"));
+const start = (configPath) => {
+    (async () => {
+        await new Promise((r) => setTimeout(r, 1));
+        const configuration = require(configPath);
+        await (0, node_webserver_1.default)(configuration);
+    })();
+};
+exports.default = start;
+//# sourceMappingURL=start.js.map

package/dist/utils/start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/utils/start.ts"],"names":[],"mappings":";;;;;AAAA,gFAAqD;AAErD,MAAM,KAAK,GAAG,CAAC,UAAkB,EAAQ,EAAE;IACzC,CAAC,KAAK,IAAI,EAAE;QACV,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAsC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7E,MAAM,IAAA,wBAAW,EAAC,aAAa,CAAC,CAAC;IACnC,CAAC,CAAC,EAAE,CAAC;AACP,CAAC,CAAC;AAEF,kBAAe,KAAK,CAAC"}

package/package.json

@@ -1,29 +1,44 @@
 {
   "name": "@koeroesi86/node-webserver-service",
-  "version": "v22.03.25-9a65a76",
+  "version": "26.10.37633705232-master",
   "description": "OS service integration for @koeroesi86/node-webserver",
   "license": "MIT",
   "author": {
     "name": "Krisztian Korosi",
     "url": "https://github.com/Koeroesi86"
   },
-  "repository": "github:Koeroesi86/node-webserver-service",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Koeroesi86/node-webserver.git",
+    "directory": "packages/node-webserver-service"
+  },
   "publishConfig": {
     "access": "public"
   },
   "bin": {
-    "nws-service": "./scripts/manageService.js"
-  },
-  "scripts": {
-    "service": "node scripts/manageService.js",
-    "start": "nodemon scripts/start.js",
-    "generate-version": "node scripts/version.js"
+    "nws-service": "./dist/scripts/manageService.js"
   },
   "dependencies": {
-    "@koeroesi86/node-webserver": "^22.3.132-5e488e1",
+    "@koeroesi86/node-webserver": "26.10.37633705232-master",
     "os-service": "^2.2.0"
   },
   "devDependencies": {
-    "nodemon": "^2.0.15"
+    "@types/node": "^24.0.0",
+    "@types/os-service": "^2.2.3",
+    "nodemon": "^2.0.15",
+    "rimraf": "^3.0.2",
+    "typescript": "^5.9.3"
+  },
+  "files": [
+    "dist",
+    "examples",
+    "configuration.example.js",
+    ".logs/.gitkeep"
+  ],
+  "gitHead": "df44146d25ab202ad04461024c6f67930c0e7026",
+  "scripts": {
+    "build": "rimraf dist && tsc -p tsconfig.json",
+    "service": "node dist/scripts/manageService.js",
+    "start": "nodemon --watch src --ext ts --exec \"npm run build --silent && node dist/scripts/start.js\""
   }
-}
+}

package/.travis.yml

@@ -1,19 +0,0 @@
-language: node_js
-node_js:
-  - "12"
-cache:
-  yarn: true
-  directories:
-    - node_modules
-    - .cache
-script:
-  - export YARN_CACHE_FOLDER=$TRAVIS_BUILD_DIR/.cache/yarn
-  - export NODE_ENV=production
-  - export TRAVIS_TAG="$(git rev-parse --short ${TRAVIS_COMMIT})"
-  - yarn generate-version
-deploy:
-  branch: master
-  provider: npm
-  skip_cleanup: true
-  email: $NPM_EMAIL
-  api_key: $NPM_TOKEN

package/scripts/manageService.js

@@ -1,54 +0,0 @@
-#!/usr/bin/env node
-
-const service = require('os-service');
-const path = require('path');
-const fs = require('fs');
-const parseArgv = require('../utils/parseArgv');
-
-const {add, remove, run, configuration} = parseArgv();
-
-const configPath = configuration || process.env.NODE_WEBSERVER_CONFIG || path.resolve(__dirname, '../configuration.example.js');
-
-if (!fs.existsSync(configPath)) {
-  throw new Error(`Configuration file does not exist: ${configPath}`);
-}
-
-const Configuration = require(configPath);
-
-if (add) {
-  service.add(Configuration.serviceName, {
-    displayName: Configuration.serviceDisplayName || Configuration.serviceName,
-    programPath: __filename,
-    programArgs: [
-      '--run',
-      ...process.argv.slice(3),
-    ]
-  }, error => {
-    if (error) {
-      console.trace(error);
-    }
-  });
-} else if (remove) {
-  service.remove(Configuration.serviceName, error => {
-    if (error) {
-      console.trace(error);
-    }
-  });
-} else if (run) {
-  const start = require('../utils/start');
-  start(configPath);
-  service.run(() => {
-    service.stop(0);
-  });
-} else {
-  console.info('\x1b[32m%s\x1b[0m', `
-    Usage:
-    
-    yarn run service [argument]
-    
-    arguments:
-        --add      Installs the service
-        --remove   Removes the service
-        --run      Attempt to run the program as a service
-    `);
-}

package/scripts/start.js

@@ -1,14 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const parseArgv = require('../utils/parseArgv');
-const start = require('../utils/start');
-
-const { configuration } = parseArgv();
-
-const configPath = configuration || process.env.NODE_WEBSERVER_CONFIG || path.resolve(__dirname, '../configuration.example.js');
-
-if (!fs.existsSync(configPath)) {
-  fs.copyFileSync(path.resolve(__dirname, '../configuration.example.js'), configPath);
-}
-
-start(configPath);

package/scripts/version.js

@@ -1,9 +0,0 @@
-const { execSync } = require('child_process');
-
-const { TRAVIS_TAG, TRAVIS_BUILD_NUMBER } = process.env;
-
-const now = new Date();
-const version = `${(now.getFullYear() + '').substring(2)}.${((now.getMonth() + 1) + '').padStart(2, '0')}.${TRAVIS_BUILD_NUMBER}-${TRAVIS_TAG || 'release'}`;
-
-execSync(`yarn version --no-git-tag-version --new-version "v${version}"`, { shell: true });
-console.log('version set', version);

package/utils/parseArgv.js

@@ -1,38 +0,0 @@
-/**
- * @param {string[]} argv
- * @returns {Object}
- */
-function parseArgv(argv = process.argv) {
-  let skipNext = false;
-  const parsedArgv =argv.reduce((result, current, index) => {
-    if (index < 2) {
-      result[index] = current;
-      return result;
-    }
-
-    if (current.indexOf('-') === 0) {
-      if (skipNext) {
-        skipNext = false;
-        return result;
-      }
-      const matches = current.match(/[-]{1,2}([a-zA-Z0-9\-]+)[=]?["']?([a-zA-Z0-9/\\.\-:]+)*["']?/);
-      result[matches[1]] = true;
-      if (matches[2]) {
-        // if there is value set
-        result[matches[1]] = matches[2];
-      } else if (argv[Number(index) + 1] && argv[Number(index) + 1].indexOf('-') !== 0) {
-        // handle spaces
-        skipNext = true;
-        result[matches[1]] = argv[Number(index) + 1].match(/["']?([a-zA-Z0-9/\\.\-:]+)*["']?/)[1];
-        return result;
-      }
-      return result;
-    }
-
-    return result;
-  }, {});
-
-  return parsedArgv;
-}
-
-module.exports = parseArgv;

package/utils/start.js

@@ -1,8 +0,0 @@
-module.exports = configPath => {
-  (async () => {
-    await new Promise(r => setTimeout(r, 1));
-    const nws = require('@koeroesi86/node-webserver');
-    const config = require(configPath);
-    await nws(config);
-  })();
-};