@goodandready/dsh-subscriptions 0.5.30 → 0.5.31

package/lib/accounts.js

@@ -189,7 +189,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   async function ensureFresh(provider, blob, ref) {
     if (!blob.refreshToken) return blob
     if (blob.expiresAt && blob.expiresAt - SKEW_MS > Date.now()) return blob
-    if (ref && refreshLocks.has(ref)) return refreshLocks.get(ref)
+    const lockKey = ref || (provider + ":" + (blob.accountId || blob.email || (blob.refreshToken && blob.refreshToken.slice(-16)) || "anon"))
+    if (refreshLocks.has(lockKey)) return refreshLocks.get(lockKey)
     const promise = (async () => {
       try {
         const cfg = vendorConfig(provider, getConfig())
@@ -220,10 +221,10 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         if (ref) refreshFailures.set(ref, { at: Date.now(), error: String(e && e.message || e) })
         throw e
       } finally {
-        if (ref) refreshLocks.delete(ref)
+        refreshLocks.delete(lockKey)
       }
     })()
-    if (ref) refreshLocks.set(ref, promise)
+    refreshLocks.set(lockKey, promise)
     return promise
   }
 

package/lib/client.js

@@ -12,6 +12,35 @@ window.__ModuleLoader__.load({
     let t = (key) => key
     const setT = (fn) => { t = fn }
 
+    class ErrorBoundary extends React.Component {
+      constructor(props) {
+        super(props)
+        this.state = { hasError: false, error: null }
+      }
+      static getDerivedStateFromError(error) {
+        return { hasError: true, error }
+      }
+      componentDidCatch(error, info) {
+        try { console.error("[dsh-subscriptions UI error]", error, info) } catch {}
+      }
+      render() {
+        if (this.state.hasError) {
+          return React.createElement(
+            "div",
+            { style: { padding: "12px", border: "1px solid var(--dsw-alias-state-error-primary, #e5534b)", borderRadius: "8px", background: "var(--dsw-alias-bg-layer-2, #1f1f1f)", margin: "8px 0", fontSize: "13px" } },
+            React.createElement("div", { style: { fontWeight: 600, color: "var(--dsw-alias-state-error-primary, #e5534b)", marginBottom: "4px" } }, "Subscriptions UI error"),
+            React.createElement("div", { style: { color: "var(--dsw-alias-label-secondary, #8b949e)", fontSize: "12px", marginBottom: "8px" } }, String(this.state.error && this.state.error.message || this.state.error || "Unknown error")),
+            React.createElement("button", {
+              className: "dsub-mini",
+              onClick: () => this.setState({ hasError: false, error: null })
+            }, "Retry")
+          )
+        }
+        return this.props.children
+      }
+    }
+
+
     const CSS =
     '.dsub-card{list-style:none;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;transition:border-color .16s,background .16s}' +
     '.dsub-card:hover{border-color:var(--dsw-alias-label-dimmed)}' +
@@ -1322,7 +1351,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement(Chevron, { className: 'dsub-chev' + (open ? ' dsub-chevOpen' : '') }),
         ),
         open ? React.createElement('div', { className: 'dsub-body' },
-          React.createElement(SubsSection, props),
+          React.createElement(ErrorBoundary, null, React.createElement(SubsSection, props)),
         ) : null,
       )
     }
@@ -1741,7 +1770,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 15,
               locale: NS,
             },
-            (props) => React.createElement(SubsPill, { t }),
+            (props) => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t })),
           ),
         )
       }, 'dsh-subscriptions: subs pill')
@@ -1757,7 +1786,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 5,
               locale: NS,
             },
-            (props) => React.createElement(ComposerQuota, { t }),
+            (props) => React.createElement(ErrorBoundary, null, React.createElement(ComposerQuota, { t })),
           ),
         )
       }, 'dsh-subscriptions: composer quota')

package/lib/http.js

@@ -64,3 +64,19 @@ export async function fetchWithTimeout(fetchImpl, url, init = {}, { timeoutMs =
     clearTimeout(timer)
   }
 }
+
+export function safeJsonHandler(fn) {
+  return async (req, res) => {
+    try {
+      await fn(req, res)
+    } catch (err) {
+      const status = Number(err && (err.status || err.statusCode) || 500)
+      const code = (err && err.code) || "INTERNAL_ERROR"
+      const message = String((err && err.message) || err || "Internal server error")
+      writeJson(res, status >= 400 && status < 600 ? status : 500, {
+        ok: false,
+        error: { code, message },
+      })
+    }
+  }
+}

package/lib/index.js

@@ -25,7 +25,6 @@ import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel, maskText } from './mask.js'
 import { proxyFetch, pickFetch } from './proxy.js'
 import { HistoryStore } from './history.js'
-import { ProactiveTokenRefreshDaemon } from './proactive-refresh.js'
 import {
   inspectGoogleAccount,
   antigravityMetadata,
@@ -112,43 +111,6 @@ export function apply(ctx, config) {
   const history = new HistoryStore()
   const recordHistory = (entry) => history.add(entry)
 
-  // Proactive token refresh daemon: runs periodically and refreshes tokens nearing expiration
-  const refreshDaemon = new ProactiveTokenRefreshDaemon({
-    refreshLeadMs: 15 * 60 * 1000,
-    checkIntervalMs: 60 * 1000,
-  })
-  refreshDaemon.start(
-    async () => {
-      const slots = normalizeSlots(live().slots)
-      const accounts = []
-      for (const slot of slots) {
-        try {
-          const raw = await store.resolveRaw(slot.ref)
-          if (!raw) continue
-          const blob = parseBlob(raw)
-          if (blob && blob.refreshToken && blob.expiresAt) {
-            accounts.push({
-              ref: slot.ref,
-              provider: slot.provider,
-              refreshToken: blob.refreshToken,
-              expiresAt: blob.expiresAt,
-              blob,
-            })
-          }
-        } catch {}
-      }
-      return accounts
-    },
-    async (acc) => {
-      try {
-        await store.ensureFresh(acc.provider, acc.blob, acc.ref)
-      } catch (e) {
-        try { ctx.log && ctx.log.warn && ctx.log.warn('[dsh-subscriptions] proactive refresh failed for ' + acc.ref + ': ' + String(e && e.message || e)) } catch {}
-      }
-    }
-  )
-  ctx.effect(() => () => refreshDaemon.stop(), 'dsh-subscriptions: proactive token refresh daemon')
-
   // #85: host-only reset credit service for Codex accounts.
   const resetCredits = createResetCreditService({ loadBlob: (ref) => store.loadBlob(ref) })
   function refForSlot(provider, index) {

package/lib/rotate.js

@@ -10,6 +10,7 @@ const SWITCH_CODES = new Set([
 
 export function isSwitchableError(err) {
   if (!err || typeof err !== 'object') return false
+  if (err.name === 'AbortError' || err.code === 'ABORT_ERR' || err.code === 'ERR_ABORTED' || (err.message && /aborted/i.test(err.message))) return false
   const code = err.code || (err.failure && err.failure.code)
   if (SWITCH_CODES.has(code)) return true
   const status = err.status || err.statusCode

package/lib/routes.js

@@ -1,5 +1,5 @@
 import { PROVIDERS, parseOauthRef, displayName, droppedCredentialRefs, oauthRef, isProvider } from './refs.js'
-import { writeJson, writeHtml, readBody, isTrustedSettingsRequest, queryOf } from './http.js'
+import { writeJson, writeHtml, readBody, isTrustedSettingsRequest, queryOf, safeJsonHandler } from './http.js'
 import { parseCallbackInput, requestOrigin, webCallbackUri } from './oauth.js'
 import { createPkce } from './pkce.js'
 import { startLoopback } from './loopback.js'
@@ -97,7 +97,7 @@ export function registerRoutes(ctx, state) {
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/status',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
@@ -165,13 +165,13 @@ export function registerRoutes(ctx, state) {
         composerQuota: String(live().composerQuota || 'off'),
         active,
       })
-    },
+    }),
   }), 'dsh-subscriptions: /status')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/reset-credits',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
@@ -186,13 +186,13 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 200, { ok: false, error: { code: 'reset', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /reset-credits')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/reset-credits/prepare',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -213,13 +213,13 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 200, { ok: false, error: { code: 'reset', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /reset-credits/prepare')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/reset-credits/consume',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -240,25 +240,25 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 200, { ok: false, error: { code: 'reset', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /reset-credits/consume')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/diagnostics',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
       }
       writeJson(res, 200, { ok: true, report: await diagnosticsReport() })
-    },
+    }),
   }), 'dsh-subscriptions: /diagnostics')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/oauth/start',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
@@ -305,7 +305,7 @@ export function registerRoutes(ctx, state) {
         } catch { autoCatch = false }
       }
       writeJson(res, 200, { ok: true, url, state: pkce.state, redirectUri, autoCatch })
-    },
+    }),
   }), 'dsh-subscriptions: /oauth/start')
 
   // #90: Device-code login (headless/VPS). Codex-only: auth.openai.com mints an
@@ -315,7 +315,7 @@ export function registerRoutes(ctx, state) {
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/oauth/device/start',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -361,13 +361,13 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 502, { ok: false, error: { code: e && e.code || 'DEVICE', message: String(e && e.message || e).slice(0, 300) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /oauth/device/start')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/oauth/device/poll',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -410,7 +410,7 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 502, { ok: false, error: { code: e && e.code || 'DEVICE', message: String(e && e.message || e).slice(0, 300) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /oauth/device/poll')
 
   ctx.effect(() => ctx.webServer.register({
@@ -441,7 +441,7 @@ export function registerRoutes(ctx, state) {
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/oauth/complete',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -470,14 +470,14 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 400, { ok: false, error: { code: 'oauth', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /oauth/complete')
 
   // ponytail: cheap per-vendor probe; never sets cooldown, never returns tokens
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/check',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -541,13 +541,13 @@ export function registerRoutes(ctx, state) {
           error: { code: e && e.code ? e.code : 'VENDOR', message: String(e && e.message || e).slice(0, 300) },
         })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /check')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/discover-local',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
         return
@@ -558,13 +558,13 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 500, { ok: false, error: { message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /discover-local')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/import-local',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -615,26 +615,24 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 400, { ok: false, error: { message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /import-local')
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/analyze-session',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
       }
-      try {
-        const body = await readBody(req).catch(() => ({}))
-        const events = Array.isArray(body && body.events) ? body.events : []
-        const analysis = analyzeSessionEvents(events)
-        writeJson(res, 200, { ok: true, analysis })
-      } catch (e) {
-        writeJson(res, 500, { ok: false, error: { message: String(e && e.message || e) } })
-      }
-    },
+      const raw = await readBody(req, 128 * 1024).catch(() => Buffer.alloc(0))
+      let body = {}
+      try { body = JSON.parse(raw.toString('utf8') || '{}') } catch {}
+      const events = Array.isArray(body && body.events) ? body.events : []
+      const analysis = analyzeSessionEvents(events)
+      writeJson(res, 200, { ok: true, analysis })
+    }),
   }), 'dsh-subscriptions: /analyze-session')
 
 
@@ -645,7 +643,7 @@ export function registerRoutes(ctx, state) {
   ctx.effect(() => ctx.webServer.register({
     kind: 'prefix',
     path: '/dsh-subscriptions/proxy',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST' && req.method !== 'GET') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET or POST' } })
         return
@@ -691,14 +689,14 @@ export function registerRoutes(ctx, state) {
         const status = e && e.status ? e.status : (e && e.code === 'FORBIDDEN' ? 403 : (e && e.code === 'AUTH' ? 401 : 502))
         writeJson(res, status, { ok: false, error: { code: e && e.code || 'VENDOR', message: String(e && e.message || e).slice(0, 300) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: proxy')
 
   // #88: проверка прокси аккаунта — реальный запрос к эндпоинту провайдера с замером задержки.
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/proxy-check',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -749,14 +747,14 @@ export function registerRoutes(ctx, state) {
           error: { code: (e && e.code) || 'NETWORK', message: String((e && e.message) || e).slice(0, 200) },
         })
       }
-    },
+    }),
   }), 'dsh-subscriptions: proxy-check')
 
   // Экспорт зашифрованного бандла токенов. Токены не логгируются.
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/export',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -793,14 +791,14 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 500, { ok: false, error: { code: 'export', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /export')
 
   // Импорт зашифрованного бандла.
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/import',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -839,14 +837,14 @@ export function registerRoutes(ctx, state) {
       }
       await syncAdapter()
       writeJson(res, 200, { ok: true, imported, total: bundle.accounts.length, accounts: await accountsView() })
-    },
+    }),
   }), 'dsh-subscriptions: /import')
 
   // #45: импорт существующего refresh token / API key без OAuth-флоу.
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/import-token',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -883,7 +881,7 @@ export function registerRoutes(ctx, state) {
       } catch (e) {
         writeJson(res, 400, { ok: false, error: { code: 'import', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /import-token')
 
   // #50: сводная страница /subscriptions (localhost-only).
@@ -981,7 +979,7 @@ function esc(x){return String(x==null?'':x).replace(/&/g,'&amp;').replace(/</g,'
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/logout',
-    handler: async (req, res) => {
+    handler: safeJsonHandler(async (req, res) => {
       if (req.method !== 'POST') {
         writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
         return
@@ -1004,7 +1002,7 @@ function esc(x){return String(x==null?'':x).replace(/&/g,'&amp;').replace(/</g,'
       } catch (e) {
         writeJson(res, 400, { ok: false, error: { code: 'logout', message: String(e && e.message || e) } })
       }
-    },
+    }),
   }), 'dsh-subscriptions: /logout')
 }
 

package/lib/sse.js

@@ -10,6 +10,7 @@ export async function* iterateSse(body, { idleTimeoutMs = 60000, signal } = {})
       buffer = buffer.slice(sep).replace(/^\r?\n\r?\n/, '')
       const dataLines = []
       for (const line of raw.split(/\r?\n/)) {
+        if (line.startsWith(":")) continue // SSE comments / keep-alive pings
         if (line.startsWith('data:')) dataLines.push(line.slice(5).trimStart())
       }
       if (!dataLines.length) continue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.5.30",
+  "version": "0.5.31",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -34,9 +34,6 @@
   "bugs": {
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
-  "scripts": {
-    "test": "eslint lib/ && node --test test/*.test.mjs"
-  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -63,5 +60,8 @@
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "0.1.0-rc.8"
+  },
+  "scripts": {
+    "test": "eslint lib/ && node --test test/*.test.mjs"
   }
-}
+}

package/lib/proactive-refresh.js

@@ -1,37 +0,0 @@
-export class ProactiveTokenRefreshDaemon {
-  constructor({ refreshLeadMs = 15 * 60 * 1000, checkIntervalMs = 60 * 1000 } = {}) {
-    this.refreshLeadMs = refreshLeadMs // refresh 15 min before token expires
-    this.checkIntervalMs = checkIntervalMs
-    this.timer = null
-  }
-
-  start(getAccountsFn, refreshFn) {
-    if (this.timer) return
-    this.timer = setInterval(async () => {
-      try {
-        const accounts = (typeof getAccountsFn === 'function' && await getAccountsFn()) || []
-        const now = Date.now()
-        for (const acc of accounts) {
-          if (!acc || !acc.expiresAt || !acc.refreshToken) continue
-          const expiresAt = Number(acc.expiresAt)
-          if (expiresAt - now <= this.refreshLeadMs && expiresAt > now) {
-            if (typeof refreshFn === 'function') {
-              await refreshFn(acc)
-            }
-          }
-        }
-      } catch {
-        // silent catch on daemon tick
-      }
-    }, this.checkIntervalMs)
-
-    if (this.timer.unref) this.timer.unref()
-  }
-
-  stop() {
-    if (this.timer) {
-      clearInterval(this.timer)
-      this.timer = null
-    }
-  }
-}