aweshare 0.3.0 → 0.3.1

package/README.md

@@ -14,7 +14,7 @@
     <a href="https://ko-fi.com/mugpeng"><img src="https://img.shields.io/badge/Ko--fi-Buy%20me%20a%20coffee-FF5E5B?style=flat-square&logo=ko-fi&logoColor=white" alt="Ko-fi"></a>
   </p>
   <p>
-     <a href="https://github.com/wehuman01/aweshare-source/releases"><img src="https://img.shields.io/badge/version-0.3.0-7C3AED?style=flat-square" alt="Version"></a>
+     <a href="https://github.com/wehuman01/aweshare-source/releases"><img src="https://img.shields.io/badge/version-0.3.1-7C3AED?style=flat-square" alt="Version"></a>
     <a href="https://github.com/wehuman01/aweshare"><img src="https://img.shields.io/badge/node-%E2%89%A522-0EA5E9?style=flat-square" alt="Node"></a>
     <a href="https://github.com/wehuman01/aweshare/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-proprietary-E34F26?style=flat-square" alt="License"></a>
     <a href="https://www.npmjs.com/package/aweshare"><img src="https://img.shields.io/badge/npm-aweshare-7C3AED?style=flat-square" alt="npm package"></a>

package/apps/hub/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aweshare/hub",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "private": true,
   "type": "module",
   "license": "MIT",

package/bin/self-update.mjs

@@ -15,6 +15,22 @@ const VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.u
 
 const CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
 const REMIND_INTERVAL_MS = 24 * 60 * 60 * 1000
+const RETRY_INTERVAL_MS = 6 * 60 * 60 * 1000
+
+/** Numeric comparison tolerant of prefixes/suffixes ("v1.2.3", prerelease tags). */
+function parseVersion(value) {
+  const parts = String(value).match(/\d+/g)
+  return parts ? parts.slice(0, 3).map(Number) : [0]
+}
+
+export function versionGte(current, latest) {
+  const a = parseVersion(current)
+  const b = parseVersion(latest)
+  for (let i = 0; i < 3; i++) {
+    if ((a[i] ?? 0) !== (b[i] ?? 0)) return (a[i] ?? 0) > (b[i] ?? 0)
+  }
+  return true
+}
 
 function runCommand(command, args, { cwd, timeout = 120_000 } = {}) {
   return new Promise((resolve, reject) => {
@@ -67,7 +83,7 @@ export async function runSelfUpdate(args, { run = runCommand, confirmFn = confir
   console.log(`current version: ${VERSION}`)
   console.log(`latest version:  ${latest}`)
 
-  if (VERSION === latest) {
+  if (versionGte(VERSION, latest)) {
     console.log('already up to date')
     return
   }
@@ -131,23 +147,26 @@ export async function maybeCheckForUpdate(argv, { run = runCommand, cacheFile, n
   let cache = await readJson(cacheFile)
 
   let latest = null
-  if (cache && now - Date.parse(cache.lastChecked) < CHECK_INTERVAL_MS) {
+  if (cache && now < Date.parse(cache.nextCheckAt)) {
     latest = cache.latestVersion
   } else {
     try {
       latest = await getNpmLatestVersion(run)
+      cache = {
+        nextCheckAt: new Date(now + CHECK_INTERVAL_MS).toISOString(),
+        latestVersion: latest,
+        lastReminded: cache?.lastReminded ?? '',
+      }
     } catch {
+      // back off for a few hours so an offline machine does not retry on every command
+      cache = { ...cache, nextCheckAt: new Date(now + RETRY_INTERVAL_MS).toISOString(), latestVersion: null }
+      await writeJson(cacheFile, cache)
       return null
     }
-    cache = {
-      lastChecked: new Date(now).toISOString(),
-      latestVersion: latest,
-      lastReminded: cache?.lastReminded ?? '',
-    }
     await writeJson(cacheFile, cache)
   }
 
-  if (!latest || latest === VERSION) return null
+  if (!latest || versionGte(VERSION, latest)) return null
 
   const lastRemindedMs = cache.lastReminded ? Date.parse(cache.lastReminded) : 0
   if (now - lastRemindedMs < REMIND_INTERVAL_MS) return null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aweshare",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Open-source, local-first AI capability relay",
   "license": "UNLICENSED",