a

Merge branch 'crhultay-master'
Merge branch 'master' of https://github.com/crhultay/enigma-bbs into crhultay-master
2025-08-05 19:19:02 -04:00 · 2025-02-23 11:38:57 -07:00 · 2025-02-23 11:37:51 -07:00 · 2025-02-23 11:23:55 -07:00 · 2025-02-23 11:21:12 -07:00 · 2025-02-22 19:50:40 -05:00
10 changed files with 4173 additions and 144 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,16 +20,16 @@ jobs:
        id: buildx
        uses: docker/setup-buildx-action@v3

-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#      - name: Login to DockerHub
+#        uses: docker/login-action@v2
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push
        uses: docker/build-push-action@v3
        with:
-          tags: enigmabbs/enigma-bbs:latest
+          tags: d.lilpenguins.com/enigma-bbs:latest
          file: docker/Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8
          push: true
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -1,75 +0,0 @@
-name: Build and deploy jekyll site
-
-on:
-  push:
-    branches:
-      - master
-      # - source
-      # It is highly recommended that you only run this action on push to a 
-        # specific branch, eg. master or source (if on *.github.io repo)
-    
-jobs:
-  jekyll:
-    runs-on: ubuntu-latest # can change this to ubuntu-latest if you prefer
-    steps:
-      - name: 📂 setup
-        uses: actions/checkout@v2
-        # include the lines below if you are using jekyll-last-modified-at
-        # or if you would otherwise need to fetch the full commit history
-        # however this may be very slow for large repositories!
-        # with:
-          # fetch-depth: '0'
-
-      - name: 💎 setup ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7 # can change this to 2.7 or whatever version you prefer
-
-      - name: 🔨 install dependencies & build site
-        uses: limjh16/jekyll-action-ts@v2
-        with:
-          enable_cache: true
-          ### Enables caching. Similar to https://github.com/actions/cache.
-          #
-          # format_output: true
-          ### Uses prettier https://prettier.io to format jekyll output HTML.
-          #
-          # prettier_opts: '{ "useTabs": true }'
-          ### Sets prettier options (in JSON) to format output HTML. For example, output tabs over spaces.
-          ### Possible options are outlined in https://prettier.io/docs/en/options.html
-          #
-          # prettier_ignore: 'about/*'
-          ### Ignore paths for prettier to not format those html files.
-          ### Useful if the file is exceptionally large, so formatting it takes a while.
-          ### Also useful if HTML compression is enabled for that file / formatting messes it up.
-          #
-          jekyll_src: docs
-          ### If the jekyll website source is not in root, specify the directory. (in this case, sample_site)
-          ### By default, this is not required as the action searches for a _config.yml automatically.
-          #
-          gem_src: docs
-          ### By default, this is not required as the action searches for a _config.yml automatically.
-          ### However, if there are multiple Gemfiles, the action may not be able to determine which to use.
-          ### In that case, specify the directory. (in this case, sample_site)
-          ###
-          ### If jekyll_src is set, the action would automatically choose the Gemfile in jekyll_src.
-          ### In that case this input may not be needed as well.
-          #
-          # key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          # restore-keys: ${{ runner.os }}-gems-
-          ### In cases where you want to specify the cache key, enable the above 2 inputs
-          ### Follows the format here https://github.com/actions/cache
-          #
-          # custom_opts: '--drafts --lsi'
-          ### If you need to specify any Jekyll build options, enable the above input
-          ### Flags accepted can be found here https://jekyllrb.com/docs/configuration/options/#build-command-options
-
-      - name: 🚀 deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./_site
-          # if the repo you are deploying to is <username>.github.io, uncomment the line below.
-          # if you are including the line below, make sure your source files are NOT in the master branch:
-          # publish_branch: master
-
--- a/autoexec.sh
+++ b/autoexec.sh
@@ -6,7 +6,9 @@ AUTOEXEC_LOGFILE="$ENIGMA_INSTALL_DIR/logs/autoexec.log"
 TIME_FORMAT=`date "+%Y-%m-%d %H:%M:%S"`

 # Mise en place
-~/.local/bin/mise activate bash >> bash
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/.local/share/mise/shims:$PATH"
+export PATH="$HOME/.local/share/mise/installs/python/latest/bin:$PATH"

 # Environment Versions
 ENIGMA_NODE_VERSION=${ENIGMA_NODE_VERSION:=$(toml get --toml-path=$ENIGMA_INSTALL_DIR/mise.toml tools.node)}
@@ -32,8 +34,9 @@ log "- CURRENT DIR: ${PWD##}"

 if ! command -v "mise" 2>&1 >/dev/null
 then
-    log "mise is not in your PATH, activating"
-    eval "$(~/.local/bin/mise activate bash)"
+    log "mise is not in your PATH"
+    log "ERROR END"
+    exit 1
 fi

 if ! command -v "node" 2>&1 >/dev/null
--- a/core/oputil/oputil_config.js
+++ b/core/oputil/oputil_config.js
@@ -297,6 +297,14 @@ function catCurrentConfig() {
            keepWsc: false === argv.comments ? false : true,
        });

+        if (argv.meow) {
+            console.info(
+`    /\\_/\\
+   ( o.o )
+    > ^ < ... mrow...`);
+            return;
+        }
+        
        console.log(hjson.stringify(config, hjsonOpts));
    } catch (e) {
        if ('ENOENT' == e.code) {
--- a/core/oputil/oputil_help.js
+++ b/core/oputil/oputil_help.js
@@ -102,7 +102,7 @@ Actions:
  cat                      Write current configuration to stdout

 cat arguments:
-  --no-color               Disable color
+  --no-colors              Disable color
  --no-comments            Strip any comments
 `,
    FileBase: `usage: oputil.js fb <action> [<arguments>]
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,6 @@
 [tools]
-node = '18'
-python = '3.10'
+node = '22'
+python = "3.12"

 [env]
 NODE_ENV = 'production'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
    ],
    "dependencies": {
        "@breejs/later": "4.1.0",
-        "async": "3.2.4",
+        "async": "^3.2.4",
        "binary-parser": "2.1.0",
        "buffers": "github:NuSkooler/node-buffers",
        "bunyan": "1.8.15",
@@ -51,7 +51,7 @@
        "moment": "2.29.4",
        "nntp-server": "3.1.0",
        "node-pty": "1.0.0",
-        "nodemailer": "6.7.7",
+        "nodemailer": "^6.10.0",
        "otplib": "11.0.1",
        "qrcode-generator": "^1.4.4",
        "rlogin": "^1.0.0",
@@ -60,7 +60,7 @@
        "sqlite3": "5.1.6",
        "sqlite3-trans": "1.3.0",
        "ssh2": "1.14.0",
-        "systeminformation": "5.21.7",
+        "systeminformation": "^5.25.11",
        "telnet-socket": "0.2.4",
        "temptmp": "^1.1.0",
        "uuid": "8.3.2",
@@ -74,6 +74,6 @@
        "prettier": "2.7.1"
    },
    "engines": {
-        "node": ">=14"
+        "node": ">=22"
    }
 }
--- a/watch.sh
+++ b/watch.sh
--- a/yarn.lock
+++ b/yarn.lock
@@ -69,9 +69,9 @@ agent-base@^6.0.2, agent-base@6:
    debug "4"

 agentkeepalive@^4.1.3:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  version "4.6.0"
+  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz"
+  integrity sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==
  dependencies:
    humanize-ms "^1.2.1"

@@ -111,9 +111,9 @@ anymatch@^3.1.1:
    picomatch "^2.0.4"

 "aproba@^1.0.3 || ^2.0.0":
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==

 are-we-there-yet@^2.0.0:
  version "2.0.0"
@@ -150,10 +150,10 @@ asn1@^0.2.6:
  dependencies:
    safer-buffer "~2.1.0"

-async@3.2.4:
-  version "3.2.4"
-  resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+async@^3.2.4:
+  version "3.2.6"
+  resolved "https://registry.npmjs.org/async/-/async-3.2.6.tgz"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==

 balanced-match@^1.0.0:
  version "1.0.2"
@@ -206,7 +206,7 @@ brace-expansion@^2.0.1:
  dependencies:
    balanced-match "^1.0.0"

-braces@^3.0.2:
+braces@^3.0.3:
  version "3.0.3"
  resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz"
  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
@@ -235,7 +235,8 @@ buffer@^5.5.0:

 "buffers@github:NuSkooler/node-buffers":
  version "0.1.1"
-  resolved "git+ssh://git@github.com/NuSkooler/node-buffers.git#cd0855598f7048b02f0a51c90e22573973e9e2c2"
+  resolved "https://codeload.github.com/NuSkooler/node-buffers/tar.gz/cd0855598f7048b02f0a51c90e22573973e9e2c2"
+  integrity sha512-1ecGbvOuz+ipxY5u3fLHpYOyYegFwb+RF0c1SARAR3ENHUrbkqLouoGyxSVM2FrNLPXzMCpsDNnYBqfvS2z3mQ==

 buildcheck@~0.0.6:
  version "0.0.6"
@@ -378,9 +379,9 @@ cross-spawn@^7.0.0:
    which "^2.0.1"

 debug@^4.3.3, debug@4:
-  version "4.3.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
  dependencies:
    ms "^2.1.3"

@@ -604,19 +605,7 @@ glob@^6.0.1:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-glob@^7.0.3:
-  version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.3:
+glob@^7.0.3, glob@^7.1.3:
  version "7.2.3"
  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -946,11 +935,11 @@ merge-stream@^2.0.0:
  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==

 micromatch@^4.0.2:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
  dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
    picomatch "^2.3.1"

 mime-db@1.52.0:
@@ -1090,9 +1079,9 @@ mv@~2:
    rimraf "~2.4.0"

 nan@^2.14.0, nan@^2.17.0, nan@^2.19.0:
-  version "2.22.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz"
-  integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
+  version "2.22.1"
+  resolved "https://registry.npmjs.org/nan/-/nan-2.22.1.tgz"
+  integrity sha512-pfRR4ZcNTSm2ZFHaztuvbICf+hyiG6ecA06SfAxoPmuHjvMu0KUIae7Y8GyVkbBqeEIidsmXeYooWIX9+qjfRQ==

 ncp@~2.0.0:
  version "2.0.0"
@@ -1154,10 +1143,10 @@ node-pty@1.0.0:
  dependencies:
    nan "^2.17.0"

-nodemailer@6.7.7:
-  version "6.7.7"
-  resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.7.tgz"
-  integrity sha512-pOLC/s+2I1EXuSqO5Wa34i3kXZG3gugDssH+ZNCevHad65tc8vQlCQpOLaUjopvkRQKm2Cki2aME7fEOPRy3bA==
+nodemailer@^6.10.0:
+  version "6.10.0"
+  resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz"
+  integrity sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==

 nopt@^5.0.0:
  version "5.0.0"
@@ -1390,9 +1379,9 @@ run-async@^2.4.0:
  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==

 rxjs@^7.5.5:
-  version "7.8.1"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  version "7.8.2"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz"
+  integrity sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==
  dependencies:
    tslib "^2.1.0"

@@ -1439,9 +1428,9 @@ semver@^6.0.0:
  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

 semver@^7.3.5:
-  version "7.6.3"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+  version "7.7.1"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz"
+  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==

 serialize-error@^8.1.0:
  version "8.1.0"
@@ -1487,9 +1476,9 @@ socks-proxy-agent@^6.0.0:
    socks "^2.6.2"

 socks@^2.6.2:
-  version "2.8.3"
-  resolved "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz"
-  integrity sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==
+  version "2.8.4"
+  resolved "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz"
+  integrity sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==
  dependencies:
    ip-address "^9.0.5"
    smart-buffer "^4.2.0"
@@ -1575,10 +1564,10 @@ supports-color@^7.1.0:
  dependencies:
    has-flag "^4.0.0"

-systeminformation@5.21.7:
-  version "5.21.7"
-  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.7.tgz"
-  integrity sha512-K3LjnajrazTLTD61+87DFg8IXFk5ljx6nSBqB8pQLtC1UPivAjDtTYGPZ8jaBFxcesPaCOkvLRtBq+RFscrsLw==
+systeminformation@^5.25.11:
+  version "5.25.11"
+  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.25.11.tgz"
+  integrity sha512-jI01fn/t47rrLTQB0FTlMCC+5dYx8o0RRF+R4BPiUNsvg5OdY0s9DKMFmJGrx5SwMZQ4cag0Gl6v8oycso9b/g==

 tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
  version "6.2.1"
Author	SHA1	Message	Date
Chris Richardson	acaeff190d	a Some checks failed CodeQL / Analyze (javascript) (push) Has been cancelled Details Docker / buildx (push) Has been cancelled Details	2025-08-05 19:19:02 -04:00
Bryan Ashby	99a4955db4	Merge branch 'crhultay-master'	2025-02-23 11:38:57 -07:00
Bryan Ashby	ce8aab5adc	Merge branch 'master' of https://github.com/crhultay/enigma-bbs into crhultay-master	2025-02-23 11:37:51 -07:00
Bryan Ashby	ff562ce316	Merge pull request #557 from NuSkooler/dependabot/npm_and_yarn/ws-7.5.10 Bump ws from 7.4.3 to 7.5.10	2025-02-23 11:23:55 -07:00
Bryan Ashby	7d0248e970	Sync with master	2025-02-23 11:21:12 -07:00
crhultay	d0158cba49	Merge branch 'master' of github.com:crhultay/enigma-bbs	2025-02-22 19:50:40 -05:00
Carl Roman Hultay	caeec555bd	NodeJS Upgrade and watch.sh +x fix	2025-02-22 19:32:31 -05:00
Bryan Ashby	6766f6edf9	Merge pull request #584 from crhultay/patch-1 autoexec.sh environment enhancement	2024-12-04 09:47:43 -07:00
Carl Roman Hultay	56df7ebf26	autoexec.sh environment enhancement These changes are to fix an issue I encountered on a vanilla built Ubuntu Server with a fresh enigma install	2024-12-04 10:47:23 -05:00
Bryan Ashby	23f9fa6e49	Merge pull request #583 from crhultay/patch-1 Fix oputil cat help page colour flag reference	2024-12-03 13:00:39 -07:00
Carl Roman Hultay	375674fbdf	Update oputil_config.js	2024-11-29 07:04:59 -05:00
Carl Roman Hultay	54a423b0d5	Fix oputil cat help page colour flag reference	2024-11-29 07:03:44 -05:00
Carl Roman Hultay	fe5bd4126f	Delete watch.sh	2024-11-25 08:30:47 -05:00
Carl Roman Hultay	f27152daa5	Create watch.sh	2024-11-25 08:29:56 -05:00
dependabot[bot]	59f9d54ce3	Bump ws from 7.4.3 to 7.5.10 Bumps [ws](https://github.com/websockets/ws) from 7.4.3 to 7.5.10. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.4.3...7.5.10) --- updated-dependencies: - dependency-name: ws dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-08-31 17:27:34 +00:00