FIX: CI Linting by ukch · Pull Request #41 · biblemesh/toad-reader-server

ukch · 2025-12-23T20:43:38Z

delete an unused module
code to be run in the browser should now have a .browser.js extension, so it is linted correctly

Fydon

Thank you for taking the time to deal with all these issues.

widget_setup.js‎ must be available at scripts/widget_setup.js‎ for existing embeds of the ereader to continue to work.

Fydon · 2026-01-06T15:31:07Z

src/routes/search_routes.js

        util.dedup(
          searchStr
-            .replace(/[- .,;–—"“”'‘’`~!()|\\{}\[\]:<>/?*]+/g, " ")
+            .replace(/[- .,;–—"“”'‘’`~!()|\\{}[\]:<>/?*]+/g, " ")


Why is the escape for [ being removed?

According to eslint, it is not necessary to escape the [ character in this context.

Fydon · 2026-01-06T15:32:01Z

src/routes/user_routes.js

    const locale = language || req.idpLang || 'en'

-    const urlWithoutEditing = `${util.getProtocol({ req })}://${req.headers.host}${req.originalUrl.replace(/([\?&])editing=1&?/, '$1').replace(/iniframe=1&?/, '').replace(/[\?&]$/, '')}`
+    const urlWithoutEditing = `${util.getProtocol({ req })}://${req.headers.host}${req.originalUrl.replace(/([?&])editing=1&?/, '$1').replace(/iniframe=1&?/, '').replace(/[?&]$/, '')}`


Why are the escapes for ? being removed?

According to eslint, it is not necessary to escape the ? character in this context.

Fydon · 2026-01-06T15:37:52Z

src/utils/util.js


    // Split timestamp into [ Y, M, D, h, m, s, ms ]
-    var t = mysqlDatetime.split(/[- :\.]/)
+    var t = mysqlDatetime.split(/[- :.]/)


Why is the escape for . being removed?

According to eslint, it is not necessary to escape the . character in this context.

Fydon · 2026-01-06T15:43:08Z

src/utils/util.js


  isValidEmail: email => {
-    const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+    const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/


Why are the escapes for [ being removed?

ukch · 2026-01-07T01:27:37Z

widget_setup.js‎ must be available at scripts/widget_setup.js‎ for existing embeds of the ereader to continue to work.

Although this file has been renamed at source, it is still available at the same URL, that is "src/js/widget_setup.js". Any existing embed will still be able to find the file at the same URL as it was available in the past.

Edit: I was misunderstanding what this route was doing. I have since refactored it to be more sensible.

Fydon · 2026-01-07T11:26:34Z

The embed for staging is at https://stg.read.biblemesh.com/scripts/widget_setup.js

ukch · 2026-01-07T22:54:24Z

I'm seeing this stack trace when running the Docker image:

reader-1                | Error: Cannot find module '../utils/web-funcs'
reader-1                | Require stack:
reader-1                | - /app/src/routes/auth_routes.js
reader-1                | - /app/src/routes/routes.js
reader-1                | - /app/app.js
reader-1                |     at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1028:15)
reader-1                |     at Function.Module._load (node:internal/modules/cjs/loader:873:27)
reader-1                |     at Module.require (node:internal/modules/cjs/loader:1100:19)
reader-1                |     at Module.patchedRequire (/app/node_modules/require-in-the-middle/index.js:233:34)
reader-1                |     at Module.Hook._require.Module.require (/app/node_modules/require-in-the-middle/index.js:181:27)
reader-1                |     at Module.patchedRequire (/app/node_modules/require-in-the-middle/index.js:233:34)
reader-1                |     at Module.Hook._require.Module.require (/app/node_modules/require-in-the-middle/index.js:181:27)
reader-1                |     at require (node:internal/modules/cjs/helpers:119:18)
reader-1                |     at Object.<anonymous> (/app/src/routes/auth_routes.js:5:39)
reader-1                |     at Module._compile (node:internal/modules/cjs/loader:1198:14) {
reader-1                |   code: 'MODULE_NOT_FOUND',
reader-1                |   requireStack: [
reader-1                |     '/app/src/routes/auth_routes.js',
reader-1                |     '/app/src/routes/routes.js',
reader-1                |     '/app/app.js'
reader-1                |   ]
reader-1                | }

To investigate

src/routes/auth_routes.js

ukch · 2026-01-08T03:21:55Z

widget_setup.js‎ must be available at scripts/widget_setup.js‎ for existing embeds of the ereader to continue to work.

I fixed this and added a test. Please re-review.

Fydon

Thank you. If you've validated that the regex checks haven't changed, I'm happy with these changes

ukch added 2 commits December 22, 2025 21:07

Fix: add yaml files to lint-staged config

e29dee9

Fix all eslint errors

96592e5

ukch requested review from Fydon and alitokgonul December 23, 2025 20:43

ukch marked this pull request as ready for review December 23, 2025 21:45

Fydon requested changes Jan 6, 2026

View reviewed changes

ukch commented Jan 7, 2026

View reviewed changes

src/routes/auth_routes.js Outdated Show resolved Hide resolved

ukch added 2 commits January 7, 2026 23:30

Fix import path

d9bf94c

Serve the correct file; add a test

6f37bde

ukch requested a review from Fydon January 8, 2026 03:21

Fydon approved these changes Jan 8, 2026

View reviewed changes

alitokgonul approved these changes Jan 12, 2026

View reviewed changes

ukch merged commit e6440c7 into bm-develop Jan 14, 2026
6 checks passed

ukch deleted the fix/ci-lint branch January 14, 2026 14:59

ukch mentioned this pull request Jan 30, 2026

Fix/reader hanging #59

Merged

Conversation

ukch commented Dec 23, 2025

Uh oh!

Fydon left a comment

Choose a reason for hiding this comment

Uh oh!

Fydon Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ukch Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Fydon Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ukch Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Fydon Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ukch Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Fydon Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

ukch commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Fydon commented Jan 7, 2026

Uh oh!

ukch commented Jan 7, 2026

Uh oh!

Uh oh!

ukch commented Jan 8, 2026

Uh oh!

Fydon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ukch commented Jan 7, 2026 •

edited

Loading