@goodandready/dsh-russian-lang 0.3.8 → 0.3.10

package/lib/pure.js

@@ -468,23 +468,18 @@ const SHORT_WORDS_RE = /(^|[\s(«])([вВнНсСпПоОкКуУиИаА]|из|
  */
 export const formatInputLive = (text) => {
   if (!text || typeof text !== 'string') return text
-
-  // Разбиваем по блокам кода (inline `...` или fenced ```...```), чтобы не портить синтаксис
   const parts = text.split(/(```[\s\S]*?```|`[^`\n]*`)/g)
   for (let i = 0; i < parts.length; i += 2) {
     let s = parts[i]
     if (!s) continue
-
-    // 2. Длинное тире (-- -> —)
+    const lq = [], cf = []
+    s = s.replace(/"([^"\n]*[a-zA-Z][^"\n]*)"/g, (m) => `\x01L${lq.push(m) - 1}\x01`)
+    s = s.replace(/(^|\s)(--[a-zA-Z0-9_\u0400-\u04FF-]+)/g, (m, p1, p2) => `${p1}\x01C${cf.push(p2) - 1}\x01`)
+    s = s.replace(/(^|\s)(--)(?=\s|$)/g, (m, p1, p2) => /[a-zA-Z]/.test(text) ? `${p1}\x01C${cf.push(p2) - 1}\x01` : m)
     s = s.replace(/--/g, '—')
-
-    // 3. Кавычки-ёлочки («...») с учётом открывающейся/закрывающейся
-    s = s.replace(/(^|[\s([{-])"/g, '$1«')
-    s = s.replace(/"/g, '»')
-
-    // 4. Неразрывный пробел после коротких слов/предлогов
+    s = s.replace(/(^|[\s([{-])"/g, '$1«').replace(/"/g, '»')
     s = s.replace(SHORT_WORDS_RE, '$1$2\u00A0')
-
+    s = s.replace(/\x01C(\d+)\x01/g, (_, j) => cf[+j]).replace(/\x01L(\d+)\x01/g, (_, j) => lq[+j])
     parts[i] = s
   }
   return parts.join('')

package/lib/translator.js

@@ -14,23 +14,53 @@ function execPromise(cmd, args, timeoutMs = 15000) {
   })
 }
 
-function readJsonBody(request, limit = 500_000) {
+export function readJsonBody(request, limit = 500_000) {
   return new Promise((resolve, reject) => {
+    // 1. Ранняя проверка Content-Length
+    const contentLength = request?.headers?.['content-length']
+    if (contentLength && parseInt(contentLength, 10) > limit) {
+      const err = new Error('Payload too large')
+      err.statusCode = 413
+      return reject(err)
+    }
+
     let body = ''
-    request.on('data', (chunk) => {
-      body += chunk
-      if (body.length > limit) {
-        reject(new Error('Payload too large'))
+    let bytesReceived = 0
+    let settled = false
+
+    const onData = (chunk) => {
+      if (settled) return
+      const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk))
+      bytesReceived += buf.length
+      if (bytesReceived > limit) {
+        settled = true
+        if (typeof request.removeListener === 'function') request.removeListener('data', onData)
+        if (typeof request.destroy === 'function') request.destroy()
+        const err = new Error('Payload too large')
+        err.statusCode = 413
+        return reject(err)
       }
-    })
+      body += buf.toString('utf8')
+    }
+
+    request.on('data', onData)
+
     request.on('end', () => {
+      if (settled) return
+      settled = true
       try {
         resolve(body ? JSON.parse(body) : {})
       } catch (err) {
+        err.statusCode = 400
         reject(err)
       }
     })
-    request.on('error', reject)
+
+    request.on('error', (err) => {
+      if (settled) return
+      settled = true
+      reject(err)
+    })
   })
 }
 
@@ -54,7 +84,6 @@ export const TRANSLATOR_HEADER = 'x-dsh-translator'
 
 export function isTrustedTranslatorRequest(request) {
   if (header(request, TRANSLATOR_HEADER) !== '1') return false
-  if (!isLoopback(request?.socket?.remoteAddress)) return false
   const site = header(request, 'sec-fetch-site')
   if (site !== undefined && site !== 'same-origin') return false
   const origin = header(request, 'origin')
@@ -62,11 +91,10 @@ export function isTrustedTranslatorRequest(request) {
   if (origin === undefined || host === undefined) return false
   try {
     const url = new URL(origin)
-    return (
-      (url.protocol === 'http:' || url.protocol === 'https:') &&
-      isLoopback(url.hostname) &&
-      url.host === host
-    )
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') return false
+    // Same-origin check: Origin host must match Host header.
+    // Accepts loopback, LAN, and Tailscale addresses alike.
+    return url.host === host
   } catch {
     return false
   }
@@ -136,7 +164,7 @@ export async function setupLibreTranslateContainer() {
       '--name', 'libretranslate',
       '--restart', 'unless-stopped',
       '-p', '127.0.0.1:5000:5000',
-      'libretranslate/libretranslate',
+      'libretranslate/libretranslate:v1.5.3',
       '--load-only', 'en,ru,zh'
     ], 30000)
     return { ok: true, action: 'created', message: 'Контейнер libretranslate создан и запускается (~600 МБ RAM).' }
@@ -234,8 +262,9 @@ export function registerTranslator(wctx, settingsCtx) {
           })
           response.end(JSON.stringify(status))
         } catch (err) {
-          response.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })
-          response.end(JSON.stringify({ error: String(err) }))
+          const status = err && err.statusCode ? err.statusCode : 500
+          response.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({ error: err && err.message ? err.message : String(err) }))
         }
       }
     })
@@ -268,8 +297,9 @@ export function registerTranslator(wctx, settingsCtx) {
           })
           response.end(JSON.stringify(result))
         } catch (err) {
-          response.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })
-          response.end(JSON.stringify({ error: String(err) }))
+          const status = err && err.statusCode ? err.statusCode : 500
+          response.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({ error: err && err.message ? err.message : String(err) }))
         }
       }
     })
@@ -343,8 +373,9 @@ export function registerTranslator(wctx, settingsCtx) {
           })
           response.end(JSON.stringify({ translatedText, engine }))
         } catch (err) {
-          response.writeHead(500, { 'content-type': 'application/json; charset=utf-8' })
-          response.end(JSON.stringify({ error: String(err) }))
+          const status = err && err.statusCode ? err.statusCode : 500
+          response.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
+          response.end(JSON.stringify({ error: err && err.message ? err.message : String(err) }))
         }
       }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-russian-lang",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "Russian localization for DeepSeek Harness (DSH v0.1.7-rc.1+) web UI: adds Русский as native language option. 100.0% coverage across 11,295 keys (127 namespaces). Features full DSH v0.1.7-rc.1 core support (terminal, archive, command palette, Auto review, trajectory, PTC/Creator presets) and complete GoodAndReady plugin catalog (subscriptions, tts, image-gen, voice, key-limits, notify, commandcode, plugin-console).",
   "type": "module",
   "main": "lib/index.js",