@goodandready/dsh-subscriptions 0.5.1 → 0.5.3

package/lib/client.js

@@ -32,7 +32,8 @@ window.__ModuleLoader__.load({
     '.dsub-mini{appearance:none;font:inherit;font-size:12px;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;padding:3px 8px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);transition:all .15s}' +
     '.dsub-mini:hover{background:var(--dsw-alias-bg-layer-1);border-color:var(--dsw-alias-label-dimmed)}' +
     '.dsub-ok{font-size:12px;color:var(--dsw-alias-state-success-primary)}' +
-    '.dsub-bad{font-size:12px;color:var(--dsw-alias-state-error-primary)}' +
+    '.dsub-bad{font-size:12px;color:var(--dsw-alias-state-error-primary);overflow-wrap:anywhere;word-break:break-word;max-width:100%}' +
+    '.dsub-hint{overflow-wrap:anywhere;word-break:break-word;max-width:100%}' +
     '.dsub-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:5px 12px;font-size:12.5px;font-weight:500;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);transition:all .15s}' +
     '.dsub-btn:hover{background:var(--dsw-alias-bg-layer-1);border-color:var(--dsw-alias-label-dimmed)}' +
     '.dsub-inp{height:30px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);border-radius:6px;padding:0 8px;font-size:12px;min-width:180px}' +
@@ -83,6 +84,8 @@ window.__ModuleLoader__.load({
     '.dsub-brandOllama{background:rgba(107,114,128,.15);color:#9ca3af;border:1px solid rgba(107,114,128,.3)}' +
     '.dsub-brandKimi{background:rgba(236,72,153,.15);color:#f472b6;border:1px solid rgba(236,72,153,.3)}' +
     '.dsub-brandGlm{background:rgba(20,184,166,.15);color:#2dd4bf;border:1px solid rgba(20,184,166,.3)}' +
+    '.dsub-planBadge{display:inline-flex;align-items:center;padding:1px 6px;border-radius:4px;font-size:10px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;background:rgba(99,102,241,.15);color:#818cf8;border:1px solid rgba(99,102,241,.3);margin-left:6px}' +
+    
     '.dsub-accInfo{flex:1;min-width:0;display:flex;flex-direction:column;gap:3px}' +
     '.dsub-accNameRow{display:flex;align-items:center;justify-content:space-between;gap:8px}' +
     '.dsub-accName{font-size:13px;font-weight:600}' +
@@ -322,7 +325,49 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     }
 
     // #51: live countdown to the quota window reset (account.quota.resetAt).
-        function formatRelativeReset(resetAt, lang, now) {
+                function cleanErrorMessage(raw) {
+      if (!raw) return ''
+      var text = typeof raw === 'string' ? raw : (raw.message || String(raw))
+      text = text.trim()
+      if (text.charAt(0) === '{' && text.charAt(text.length - 1) === '}') {
+        try {
+          var parsed = JSON.parse(text)
+          if (parsed.error && parsed.error.message) text = parsed.error.message
+          else if (parsed.message) text = parsed.message
+          else if (parsed.code) text = parsed.code
+        } catch (e) {}
+      }
+      var firstLine = text.split('\n')[0].trim()
+      if (firstLine.length > 160) return firstLine.slice(0, 157) + '...'
+      return firstLine
+    }
+
+    function normalizePlanBadge(provider, plan) {
+      if (!plan && provider !== 'kimi' && provider !== 'glm') return null
+      var p = String(plan || '').toLowerCase().replace(/[^a-z0-9]/g, '')
+      var label = plan
+      if (provider === 'codex') {
+        if (p.indexOf('pro20') >= 0 || p === 'pro') label = 'Pro 20x'
+        else if (p.indexOf('pro5') >= 0 || p.indexOf('prolite') >= 0) label = 'Pro 5x'
+        else if (p.indexOf('team') >= 0) label = 'Team'
+        else if (p.indexOf('plus') >= 0) label = 'Plus'
+        else if (p.indexOf('enterp') >= 0) label = 'Enterprise'
+      } else if (provider === 'grok') {
+        if (p.indexOf('super') >= 0) label = 'SuperGrok'
+        else if (p.indexOf('plus') >= 0) label = 'X Premium+'
+        else if (p.indexOf('premium') >= 0) label = 'X Premium'
+      } else if (provider === 'antigravity') {
+        if (p.indexOf('ultra') >= 0) label = 'Ultra'
+        else if (p.indexOf('pro') >= 0) label = 'Pro'
+      } else if (provider === 'kimi') {
+        label = 'Coding Plan'
+      } else if (provider === 'glm') {
+        label = '150% Boost'
+      }
+      return label ? React.createElement('span', { className: 'dsub-planBadge' }, label) : null
+    }
+
+    function formatRelativeReset(resetAt, lang, now) {
       if (!resetAt || !Number.isFinite(resetAt) || resetAt <= 0) return ''
       var delta = resetAt - (now || Date.now())
       var isRu = lang !== 'en'
@@ -596,7 +641,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           })
           const data = await res.json().catch(() => ({}))
           setProxyRes((m) => Object.assign({}, m, { [key]: data }))
-        } catch (e) { setErr(String(e.message || e)) }
+        } catch (e) { setErr(cleanErrorMessage(e.message || e)) }
         setChecking((c) => Object.assign({}, c, { ['proxy:' + key]: false }))
       }
 
@@ -616,7 +661,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           if (data && data.quota) {
             setAccounts((prev) => prev.map((a) => a.provider===provider && a.index===index ? Object.assign({}, a, { quota: data.quota }) : a))
           }
-        } catch (e) { setErr(String(e.message || e)) }
+        } catch (e) { setErr(cleanErrorMessage(e.message || e)) }
         setChecking((c) => Object.assign({}, c, { [key]: false }))
       }
 
@@ -737,23 +782,24 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                     },
                   }),
                   React.createElement('span', { className: 'dsub-badge' + (account.validationUrl ? ' dsub-badge-warn' : (on ? ' dsub-badge-on' : '')) }, badgeFor(account, t)),
+                  normalizePlanBadge(row.slot.provider, account.plan || (account.quota && account.quota.plan)),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
-                    onClick: () => connect(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => connect(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, on ? t('reconnect') : t('connect')),
                   (row.slot.provider === 'codex' ? React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
-                    onClick: () => deviceStartLogin(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => deviceStartLogin(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('deviceLogin')) : null),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
                     disabled: !on,
-                    onClick: () => logout(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => logout(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('disconnect')),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
                     disabled: checking[key],
-                    onClick: () => doCheck(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => doCheck(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, checking[key] ? t('checking') : t('check')),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini', title: t('removeSlot'),
@@ -761,7 +807,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                       const slot = row.slot
                       Promise.resolve(on ? logout(slot.provider, slot.index) : null)
                         .then(() => setSlots(slots.filter((_, k) => k !== row.i)))
-                        .catch((e) => setErr(String(e.message || e)))
+                        .catch((e) => setErr(cleanErrorMessage(e.message || e)))
                     },
                   }, '\u00d7'),
                 ),
@@ -776,7 +822,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   }),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
-                    onClick: () => complete(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => complete(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('submitCode')),
                 ),
                 React.createElement('div', { className: 'dsub-row' },
@@ -788,12 +834,12 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   }),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
-                    onClick: () => importToken(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => importToken(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, t('importToken')),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
                     title: t('importLocalCli'),
-                    onClick: () => importLocalCli(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => importLocalCli(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, '📥 CLI'),
                 ),
                 React.createElement('div', { className: 'dsub-row' },
@@ -810,7 +856,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
                     disabled: checking['proxy:' + key],
-                    onClick: () => doProxyCheck(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
+                    onClick: () => doProxyCheck(row.slot.provider, row.slot.index).catch((e) => setErr(cleanErrorMessage(e.message || e))),
                   }, checking['proxy:' + key] ? '\u2026' : t('proxyCheck')),
                 ),
                 (function(){
@@ -956,7 +1002,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
         React.createElement('div', { className: 'dsub-foot' },
           React.createElement('button', {
             type: 'button', className: 'dsub-save',
-            onClick: () => save().catch((e) => setErr(String(e.message || e))),
+            onClick: () => save().catch((e) => setErr(cleanErrorMessage(e.message || e))),
           }, t('save')),
           saved ? React.createElement('span', { className: 'dsub-ok' }, t('saved')) : null,
           err ? React.createElement('span', { className: 'dsub-bad' }, err) : null,

package/lib/mask.js

@@ -19,3 +19,22 @@ const EMAIL_RE = /[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}/g
 export function maskText(value) {
   return String(value || '').replace(EMAIL_RE, (m) => maskEmail(m))
 }
+
+export function cleanErrorMessage(raw) {
+  if (!raw) return ''
+  let text = typeof raw === 'string' ? raw : (raw.message || String(raw))
+  text = text.trim()
+  if (text.startsWith('{') && text.endsWith('}')) {
+    try {
+      const parsed = JSON.parse(text)
+      if (parsed.error && parsed.error.message) text = parsed.error.message
+      else if (parsed.message) text = parsed.message
+      else if (parsed.code) text = parsed.code
+    } catch {}
+  }
+  const firstLine = text.split('\n')[0].trim()
+  if (firstLine.length > 160) {
+    return firstLine.slice(0, 157) + '...'
+  }
+  return firstLine
+}

package/lib/plan.js

@@ -0,0 +1,42 @@
+/**
+ * Normalize and pretty-print subscription plans.
+ */
+
+export function normalizePlanName(provider, rawPlan) {
+  if (!rawPlan || typeof rawPlan !== 'string') {
+    if (provider === 'kimi') return 'Coding Plan'
+    if (provider === 'glm') return 'Coding Plan 150%'
+    return ''
+  }
+  const key = rawPlan.trim().toLowerCase().replace(/[^a-z0-9]/g, '')
+  if (provider === 'codex') {
+    if (key.includes('pro20') || key === 'pro') return 'Pro 20x'
+    if (key.includes('pro5') || key.includes('prolite')) return 'Pro 5x'
+    if (key.includes('team')) return 'Team'
+    if (key.includes('plus')) return 'Plus'
+    if (key.includes('enterp')) return 'Enterprise'
+    if (key.includes('edu')) return 'Edu'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'grok') {
+    if (key.includes('super')) return 'SuperGrok'
+    if (key.includes('plus') || key.includes('premiumplus')) return 'X Premium+'
+    if (key.includes('premium')) return 'X Premium'
+    if (key.includes('basic')) return 'X Basic'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'claude') {
+    if (key.includes('team')) return 'Team'
+    if (key.includes('enterp')) return 'Enterprise'
+    if (key.includes('pro')) return 'Pro'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'antigravity') {
+    if (key.includes('ultra')) return 'Ultra'
+    if (key.includes('pro')) return 'Pro'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'kimi') return 'Coding Plan'
+  if (provider === 'glm') return 'Coding Plan 150%'
+  return rawPlan
+}

package/package.json

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