@goodandready/dsh-subscriptions 0.4.5 → 0.4.7

package/lib/client.js

@@ -50,7 +50,8 @@ window.__ModuleLoader__.load({
     '.dsub-barWarn .dsub-barFill{background:var(--dsw-alias-state-warning-primary)}' +
     '.dsub-barFull .dsub-barFill{background:var(--dsw-alias-state-error-primary)}' +
     '.dsub-barRow{display:flex;align-items:center;gap:8px;font-size:12px;color:var(--dsw-alias-label-secondary)}' +
-    '.dsub-verify{font-size:12px;color:var(--dsw-alias-state-warning-primary)}' + +
+    '.dsub-manual{display:flex;flex-direction:column;gap:6px;margin-top:4px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l2)}' +
+    '.dsub-verify{font-size:12px;color:var(--dsw-alias-state-warning-primary)}' +
     '.dsub-verify a{color:var(--dsw-alias-brand-primary)}'
 
 const cssId = 'dsh-subscriptions/settings.module.css'
@@ -102,10 +103,25 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'slashStatus': 'Subscription status',
       'none': 'none',
       'forecast': '≈',
-      'resetLabel': 'сброс',
       'resetLabel': 'reset',
+      'check': 'Check',
+      'checking': 'Checking…',
+      'importToken': 'Import',
+      'importTokenPlace': 'Paste an existing token',
+      'reconnectRequired': 'Reconnect required',
+      'manualTitle': 'If the browser did not come back',
+      'windowPrimary': 'Primary window',
+      'windowSecondary': 'Secondary window',
     }
     const ru = {
+      'check': 'Проверить',
+      'checking': 'Проверяю…',
+      'importToken': 'Внести',
+      'importTokenPlace': 'Вставить уже готовый токен',
+      'reconnectRequired': 'Нужно переподключить',
+      'manualTitle': 'Если браузер не вернулся сам',
+      'windowPrimary': 'Основное окно',
+      'windowSecondary': 'Дополнительное окно',
       'notConnected': 'Не подключено',
       'verifyAccount': 'Требуется проверка',
       'coolingDown': 'Пауза после лимита',
@@ -387,7 +403,7 @@ function PluginCard(props) {
                     type: 'button', className: 'dsub-mini',
                     disabled: checking[key],
                     onClick: () => doCheck(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
-                  }, checking[key] ? '...' : 'Check'),
+                  }, checking[key] ? t('checking') : t('check')),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini', title: t('removeSlot'),
                     onClick: () => {
@@ -398,6 +414,8 @@ function PluginCard(props) {
                     },
                   }, '\u00d7'),
                 ),
+                React.createElement('div', { className: 'dsub-manual' },
+                  React.createElement('span', { className: 'dsub-sub' }, t('manualTitle')),
                 React.createElement('div', { className: 'dsub-row' },
                   React.createElement('input', {
                     className: 'dsub-grow',
@@ -422,8 +440,9 @@ function PluginCard(props) {
                     onClick: () => importToken(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
                   }, t('importToken')),
                 ),
+                ),
                 account.accountNotice ? React.createElement('div', { className: 'dsub-verify' }, account.accountNotice) : null,
-                account.refreshError ? React.createElement('div', { className: 'dsub-bad' }, 'reconnect required: ' + account.refreshError) : null,
+                account.refreshError ? React.createElement('div', { className: 'dsub-bad' }, t('reconnectRequired') + ': ' + account.refreshError) : null,
                 (function(){ var r=checkRes[key]; if(!r) return null; var txt=r.ok ? ('ok ' + (r.email||'')) : ('fail ' + (r.error && r.error.message || '')); var cls=r.ok ? 'dsub-ok' : 'dsub-bad'; var q=r.quota; if(q && q.remaining!=null) txt += ' quota:'+q.remaining+(q.limit!=null?'/'+q.limit:''); return React.createElement('div', {className: cls}, txt) })(),
                 account.validationUrl ? React.createElement('div', { className: 'dsub-verify' },
                   t('verifyPrefix'),
@@ -443,9 +462,20 @@ function PluginCard(props) {
                       React.createElement('span',null,Math.round(pct)+'%'),
                     )
                   }
+                  // Имя окна приходит от провайдера внутренним: primary_window.
+                  // Известные переводим, незнакомое хотя бы причёсываем, чтобы
+                  // в карточке не оставалось подчёркиваний из чужого протокола.
+                  function windowLabel(w){
+                    var id=String((w&&w.id)||'')
+                    if(w&&w.ru)return w.ru
+                    if(id==='primary_window')return t('windowPrimary')
+                    if(id==='secondary_window')return t('windowSecondary')
+                    if(!id)return t('quota')
+                    return id.replace(/_/g,' ')
+                  }
                   if(Array.isArray(wins)&&wins.length){
                     wins.forEach(function(w){
-                      if(w&&w.usedPercent!=null)parts.push(bar((w.ru||w.id),w.usedPercent))
+                      if(w&&w.usedPercent!=null)parts.push(bar(windowLabel(w),w.usedPercent))
                     })
                   }
                   var q=account.quota
@@ -459,7 +489,7 @@ function PluginCard(props) {
                     if(w0&&w0.usedPercent!=null&&w0.usedPercent<100){
                       var remaining=100-w0.usedPercent
                       var est=Math.floor(remaining/(w0.usedPercent/account.requests))
-                      if(est>0)parts.push(React.createElement('span',{className:'dsub-sub',key:'fc'},t('forecast')+' '+est+' ('+(w0.ru||w0.id)+')'))
+                      if(est>0)parts.push(React.createElement('span',{className:'dsub-sub',key:'fc'},t('forecast')+' '+est+' ('+windowLabel(w0)+')'))
                     }
                   }
                   if(!parts.length)return null

package/lib/index.js

@@ -898,10 +898,10 @@ export function apply(ctx, config) {
         const reset = a.quota && a.quota.resetAt ? new Date(a.quota.resetAt).toLocaleString() : ''
         const status = a.validationUrl ? 'verify' : (a.cooldownUntil && a.cooldownUntil > Date.now() ? 'cooldown' : (a.configured ? 'ok' : 'none'))
         return '<tr><td>' + escapeHtml(a.provider) + '</td><td>' + (a.index||1) + '</td>' +
-          '<td>' + esc(a.label || a.email || '') + '</td><td>' + status + '</td>' +
+          '<td>' + escapeHtml(a.label || a.email || '') + '</td><td>' + status + '</td>' +
           '<td>' + (pct != null ? Math.round(pct) + '%' : '—') + '</td>' +
           '<td>' + (rem != null ? (rem + (lim != null ? '/' + lim : '')) : '—') + '</td>' +
-          '<td>' + esc(reset) + '</td><td>' + esc(a.refreshError || '') + '</td></div>'
+          '<td>' + escapeHtml(reset) + '</td><td>' + escapeHtml(a.refreshError || '') + '</td></tr>'
       })
       const body = rows.length
         ? '<div class="grid">' + rows.join('') + '</div>'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",