@fish-under-sea/magpie-neartoken 0.2.2 → 0.2.4

package/index.mjs

@@ -181,6 +181,33 @@ async function catalog(disabled = new Set()) {
  * 所以这里不推数据、只落一个文件：`<script src="groups.js?t=…">` 一引就有。
  * 写不进去（插件目录只读）就跳过，页面退回它自己的说明。
  */
+/**
+ * stampLatest 把 npm 上的最新版本写进 page/latest.js。
+ *
+ * 页面自己查不了（沙箱禁联网），但插件能：这里顺手问一次 registry，页面
+ * 「检查更新」时加载这个脚本就知道新不新。一分钟内不重复问。
+ */
+let latestAskedAt = 0
+async function stampLatest() {
+  if (Date.now() - latestAskedAt < 60_000) return
+  latestAskedAt = Date.now()
+  try {
+    const res = await fetch('https://registry.npmjs.org/@fish-under-sea%2Fmagpie-neartoken/latest', {
+      headers: { accept: 'application/json' },
+    })
+    if (!res.ok) return
+    const body = await res.json()
+    const v = typeof body?.version === 'string' ? body.version.trim() : ''
+    if (!v) return
+    writeFileSync(
+      join(here, 'page', 'latest.js'),
+      'self.NEARTOKEN_LATEST = ' + JSON.stringify(v) + '\nself.NEARTOKEN_LATEST_AT = ' + Date.now() + '\n',
+      'utf8',
+    )
+  } catch {
+    /* 问不到就保持原样：页面会说「没查到」 */
+  }
+}
 function writeGroups(groups) {
   try {
     const js = 'self.NEARTOKEN_GROUPS = ' + JSON.stringify(groups) + '\nself.NEARTOKEN_GROUPS_AT = ' + Date.now() + '\n'
@@ -272,6 +299,7 @@ export default async function neartoken(input, options) {
       ],
       /** 余额：站点钱包端点，按 magpie 的用量卡显示。 */
       async usage(getAuth) {
+        await stampLatest()
         const auth = await getAuth()
         const key = auth?.access || auth?.key
         if (!key) throw new Error('还没有连接 NearToken')
@@ -322,6 +350,7 @@ export default async function neartoken(input, options) {
        * @returns {Promise<Record<string, object>>}
        */
       async models() {
+        await stampLatest()
         return catalog(disabled)
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fish-under-sea/magpie-neartoken",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "NearToken for magpie: a provider whose sign-in is the site's own device authorization, models listed per billing group with their multiplier, balance and vouchers on magpie's usage card, plus a page for spending and top-ups.",
   "type": "module",
   "main": "index.mjs",

package/page/app.js

@@ -155,8 +155,9 @@
   function tick() {
     tickCount += 1
     const counting = view && view.pending
-    if (counting && tickCount % 2 === 0) load().catch(() => {})
-    else if (!counting && tickCount % 60 === 0) load().catch(() => {})
+    // 等确认时每秒问一次：站点那边一点批准，这边下一拍就能接上
+    if (counting) load().catch(() => {})
+    else if (tickCount % 60 === 0) load().catch(() => {})
     if (counting) paintCountdown()
   }
 
@@ -253,6 +254,11 @@
         onclick: () => act('打开确认页', () => call('neartoken:open')),
       }, '打开确认页'),
       el('button', { disabled: !!pendingAct, onclick: () => copy(p.verificationUriComplete) }, '复制链接'),
+      el('button', {
+        class: 'ghost',
+        disabled: !!pendingAct,
+        onclick: () => { load().catch(() => {}) },
+      }, '我已确认，立即刷新'),
       el('button', {
         class: 'ghost',
         disabled: !!pendingAct,
@@ -642,6 +648,77 @@
     act('断开连接', () => call('neartoken:disconnect'))
   })
 
+  // ---------- 检查更新 ----------
+
+  /** cmp 比两段版本号：a 比 b 新返回正数。只认数字段，够用了。 */
+  function cmpVersion(a, b) {
+    const pa = String(a).split(/[.-]/).map((x) => parseInt(x, 10) || 0)
+    const pb = String(b).split(/[.-]/).map((x) => parseInt(x, 10) || 0)
+    for (let i = 0; i < Math.max(pa.length, pb.length); i += 1) {
+      const d = (pa[i] || 0) - (pb[i] || 0)
+      if (d) return d
+    }
+    return 0
+  }
+
+  /**
+   * loadLatest 取 npm 上的最新版本。
+   *
+   * 页面自己查不了，插件会把结果写成 page/latest.js；这里用 script 引入，
+   * 加 ?t= 破缓存，所以点一次「检查更新」就是现问一次。
+   */
+  function loadLatest() {
+    return new Promise((resolve) => {
+      const s = document.createElement('script')
+      s.src = 'latest.js?t=' + Date.now()
+      s.onload = () => resolve(typeof self.NEARTOKEN_LATEST === 'string' ? self.NEARTOKEN_LATEST : '')
+      s.onerror = () => resolve('')
+      document.head.append(s)
+    })
+  }
+
+  let checking = false
+  async function checkUpdate() {
+    if (checking) return
+    checking = true
+    const btn = $('updates')
+    const note = $('update-note')
+    const was = btn.textContent
+    btn.disabled = true
+    btn.textContent = '检查中…'
+    note.hidden = true
+    const latest = await loadLatest()
+    const mine = self.NEARTOKEN_VERSION || ''
+    checking = false
+    btn.disabled = false
+    btn.textContent = was
+    if (!latest) {
+      note.className = 'update-note warn'
+      note.textContent = '没查到最新版本：插件还没联网拉过一次，稍后再试。'
+      note.hidden = false
+      return
+    }
+    if (mine && cmpVersion(latest, mine) > 0) {
+      note.className = 'update-note new'
+      note.textContent = '有新版本 v' + latest + '（当前 v' + mine + '）'
+      const link = el('a', {
+        class: 'link',
+        href: 'https://github.com/Fish-under-sea/magpie-neartoken/releases',
+        target: '_blank',
+        rel: 'noreferrer',
+        style: 'margin-left:8px',
+      }, '去下载 ↗')
+      note.append(link)
+      note.hidden = false
+      return
+    }
+    note.className = 'update-note'
+    note.textContent = '已是最新 v' + (mine || latest)
+    note.hidden = false
+  }
+
+  $('updates').addEventListener('click', checkUpdate)
+
   // ---------- 画图 ----------
 
   /** stackedChart 画一张按模型堆叠的面积图；模型多于 5 个时余下的合并。 */

package/page/index.html

@@ -14,11 +14,14 @@
       <h1>NearToken</h1>
       <p class="sub" id="site">neartoken.cc</p>
     </div>
-    <span class="chip ver" id="version" title="插件版本">v—</span>
-    <a class="ghost link" id="updates" href="https://github.com/Fish-under-sea/magpie-neartoken/releases" target="_blank" rel="noreferrer">检查更新</a>
-    <span class="chip" id="status"><span class="dot"></span><span id="status-text">正在读取</span></span>
-    <button class="ghost" id="disconnect" hidden>断开连接</button>
+    <div class="actions">
+      <span class="chip ver" id="version" title="插件版本">v—</span>
+      <button class="ghost" id="updates" type="button">检查更新</button>
+      <span class="chip" id="status"><span class="dot"></span><span id="status-text">正在读取</span></span>
+      <button class="ghost" id="disconnect" type="button" hidden>断开连接</button>
+    </div>
   </header>
+  <p class="update-note" id="update-note" hidden></p>
   <main id="view" aria-live="polite">
     <div class="card"><p class="brief">正在读取 NearToken 的状态…</p></div>
   </main>

package/page/latest.js

@@ -0,0 +1,2 @@
+// 由插件在拉取目录时覆盖写入；这里只是占位。
+self.NEARTOKEN_LATEST = self.NEARTOKEN_LATEST || ''

package/page/style.css

@@ -457,4 +457,19 @@ select {
   padding: 3px 8px;
 }
 
-.ghost.link { text-decoration: none; display: inline-flex; align-items: center; }
+.ghost.link { text-decoration: none; display: inline-flex; align-items: center; }
+/* 头部按钮组：版本、检查更新、状态、断开四件一样高，右对齐 */
+.head { align-items: center; gap: 12px; }
+
+.actions { display: flex; align-items: center; gap: 8px; margin-left: auto; }
+.actions .chip { height: 28px; display: inline-flex; align-items: center; gap: 6px; padding: 0 10px; }
+.actions .ghost { height: 28px; display: inline-flex; align-items: center; }
+.actions .ghost[disabled] { opacity: 0.6; }
+
+.update-note {
+  margin: 8px 0 0;
+  font-size: 11.5px;
+  color: var(--nt-muted);
+}
+.update-note.new { color: var(--nt-accent); }
+.update-note.warn { color: var(--nt-warn, #e0a44a); }

package/page/version.js

@@ -1,2 +1,2 @@
 // 由 scripts/stamp.mjs 生成，别手改：版本号在 package.json。
-self.NEARTOKEN_VERSION = "0.2.2"
+self.NEARTOKEN_VERSION = "0.2.4"