quota-keepalive 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quota-keepalive",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Unofficial multi-provider quota inventory, check-in, keepalive scheduling, history, and quota trends for Magpie",
   "keywords": [
     "magpie",

package/src/live-options.js

@@ -1,14 +1,35 @@
 import { readFile } from "node:fs/promises"
+import { createRequire } from "node:module"
 import { isAbsolute, join, resolve } from "node:path"
 import { fileURLToPath } from "node:url"
 import { magpieConfigHome } from "./common.js"
 
+const require = createRequire(import.meta.url)
+const PACKAGE = require("../package.json")
+const EXACT_VERSION = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/
+
 export const PLUGIN_DIR = fileURLToPath(new URL("..", import.meta.url))
+export const PLUGIN_NAME = PACKAGE.name
+
+export function pluginSpecMatches(
+  spec,
+  { packageName = PLUGIN_NAME, pluginDir = PLUGIN_DIR } = {},
+) {
+  const value = typeof spec === "string" ? spec.trim() : ""
+  if (!value) return false
+  if (isAbsolute(value)) return resolve(value) === resolve(pluginDir)
+
+  const npmSpec = value.startsWith("npm:") ? value.slice(4) : value
+  if (npmSpec === packageName) return true
+  const versionPrefix = `${packageName}@`
+  if (!npmSpec.startsWith(versionPrefix)) return false
+
+  const version = npmSpec.slice(versionPrefix.length)
+  return version === "latest" || EXACT_VERSION.test(version)
+}
 
 function entryMatches(entry) {
-  const spec = typeof entry?.spec === "string" ? entry.spec.trim() : ""
-  if (!spec || !isAbsolute(spec)) return false
-  return resolve(spec) === resolve(PLUGIN_DIR)
+  return pluginSpecMatches(entry?.spec)
 }
 
 export async function readLivePluginOptions(configHome = magpieConfigHome()) {

package/src/runner.js

@@ -34,6 +34,14 @@ const BUILTIN_PROVIDERS = Object.freeze([
 
 let refreshRunning = false
 
+export function runInBackgroundTask(task) {
+  try {
+    return Promise.resolve(typeof task === "function" ? task() : task).catch(() => {})
+  } catch {
+    return Promise.resolve()
+  }
+}
+
 function nowIso() {
   return new Date().toISOString()
 }
@@ -551,6 +559,7 @@ export async function consumePendingCommand({
   runMagpieJson = defaultRunMagpieJson,
   checkin = null,
   keepalive = null,
+  runInBackground = runInBackgroundTask,
 }) {
   const id = sanitize(rawOptions.pendingId, 80)
   const action = sanitize(rawOptions.pendingAction, 24)
@@ -570,7 +579,7 @@ export async function consumePendingCommand({
   const command = await claimCommand({ commandPath: config.commandPath, id })
   if (!command || command.action !== action) return null
 
-  void (async () => {
+  const task = (async () => {
     let outcome
     try {
       outcome = await runCommand({
@@ -618,6 +627,7 @@ export async function consumePendingCommand({
       await refreshSnapshot(config, null)
     }
   })()
+  runInBackground(task)
 
   return { id, action, status: "running" }
 }