@ubiquity-os/plugin-sdk 3.11.2 → 3.12.1

package/dist/configuration.js

@@ -175,6 +175,9 @@ function resolveManifestUrl(pluginUrl) {
     while (pathname.endsWith("/") && pathname.length > 1) {
       pathname = pathname.slice(0, -1);
     }
+    if (pathname === "/") {
+      pathname = EMPTY_STRING;
+    }
     if (pathname.endsWith(".json")) {
       parsed.search = EMPTY_STRING;
       parsed.hash = EMPTY_STRING;
@@ -610,10 +613,15 @@ var ConfigurationHandler = class {
     return isGithubPlugin(plugin) ? this._fetchActionManifest(plugin) : this._fetchWorkerManifest(plugin);
   }
   async _fetchWorkerManifest(url) {
-    if (this._manifestCache[url]) {
-      return this._manifestCache[url];
+    const manifestUrl = resolveManifestUrl(url);
+    if (!manifestUrl) {
+      this._logger.warn("Invalid plugin URL; cannot fetch manifest", { pluginUrl: url });
+      return null;
+    }
+    const manifestKey = `url:${manifestUrl}`;
+    if (this._manifestCache[manifestKey]) {
+      return this._manifestCache[manifestKey];
     }
-    const manifestUrl = `${url}/manifest.json`;
     try {
       const result = await fetch(manifestUrl);
       if (!result.ok) {
@@ -622,7 +630,7 @@ var ConfigurationHandler = class {
       }
       const jsonData = await result.json();
       const manifest = this._decodeManifest(jsonData);
-      this._manifestCache[url] = manifest;
+      this._manifestCache[manifestKey] = manifest;
       return manifest;
     } catch (e) {
       this._logger.error("Could not find a manifest for Worker", { manifestUrl, err: e });
@@ -693,7 +701,7 @@ var ConfigurationHandler = class {
           return manifest;
         }
       } catch (e) {
-        this._logger.warn("Could not find a valid manifest", { owner, repo, err: e });
+        this._logger.warn(`Could not find a valid manifest for ${owner}/${repo}${ref ? "@" + ref : ""}`, { owner, repo, ref, err: e });
       }
       return null;
     })();

package/dist/configuration.mjs

@@ -136,6 +136,9 @@ function resolveManifestUrl(pluginUrl) {
     while (pathname.endsWith("/") && pathname.length > 1) {
       pathname = pathname.slice(0, -1);
     }
+    if (pathname === "/") {
+      pathname = EMPTY_STRING;
+    }
     if (pathname.endsWith(".json")) {
       parsed.search = EMPTY_STRING;
       parsed.hash = EMPTY_STRING;
@@ -571,10 +574,15 @@ var ConfigurationHandler = class {
     return isGithubPlugin(plugin) ? this._fetchActionManifest(plugin) : this._fetchWorkerManifest(plugin);
   }
   async _fetchWorkerManifest(url) {
-    if (this._manifestCache[url]) {
-      return this._manifestCache[url];
+    const manifestUrl = resolveManifestUrl(url);
+    if (!manifestUrl) {
+      this._logger.warn("Invalid plugin URL; cannot fetch manifest", { pluginUrl: url });
+      return null;
+    }
+    const manifestKey = `url:${manifestUrl}`;
+    if (this._manifestCache[manifestKey]) {
+      return this._manifestCache[manifestKey];
     }
-    const manifestUrl = `${url}/manifest.json`;
     try {
       const result = await fetch(manifestUrl);
       if (!result.ok) {
@@ -583,7 +591,7 @@ var ConfigurationHandler = class {
       }
       const jsonData = await result.json();
       const manifest = this._decodeManifest(jsonData);
-      this._manifestCache[url] = manifest;
+      this._manifestCache[manifestKey] = manifest;
       return manifest;
     } catch (e) {
       this._logger.error("Could not find a manifest for Worker", { manifestUrl, err: e });
@@ -654,7 +662,7 @@ var ConfigurationHandler = class {
           return manifest;
         }
       } catch (e) {
-        this._logger.warn("Could not find a valid manifest", { owner, repo, err: e });
+        this._logger.warn(`Could not find a valid manifest for ${owner}/${repo}${ref ? "@" + ref : ""}`, { owner, repo, ref, err: e });
       }
       return null;
     })();

package/dist/helpers.d.mts

@@ -55,5 +55,6 @@ interface RetryOptions {
     isErrorRetryable?: (error: unknown) => Promise<boolean | number> | boolean | number;
 }
 declare function retry<T>(fn: () => Promise<T>, options: RetryOptions): Promise<T>;
+declare function checkLlmRetryableState(error: unknown): boolean | number;
 
-export { type OpenRouterError, type OpenRouterModel, getOpenRouterModelTokenLimits, getOpenRouterModels, retry };
+export { type OpenRouterError, type OpenRouterModel, checkLlmRetryableState, getOpenRouterModelTokenLimits, getOpenRouterModels, retry };

package/dist/helpers.d.ts

@@ -55,5 +55,6 @@ interface RetryOptions {
     isErrorRetryable?: (error: unknown) => Promise<boolean | number> | boolean | number;
 }
 declare function retry<T>(fn: () => Promise<T>, options: RetryOptions): Promise<T>;
+declare function checkLlmRetryableState(error: unknown): boolean | number;
 
-export { type OpenRouterError, type OpenRouterModel, getOpenRouterModelTokenLimits, getOpenRouterModels, retry };
+export { type OpenRouterError, type OpenRouterModel, checkLlmRetryableState, getOpenRouterModelTokenLimits, getOpenRouterModels, retry };

package/dist/helpers.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,11 +17,20 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/helpers/index.ts
 var helpers_exports = {};
 __export(helpers_exports, {
+  checkLlmRetryableState: () => checkLlmRetryableState,
   getOpenRouterModelTokenLimits: () => getOpenRouterModelTokenLimits,
   getOpenRouterModels: () => getOpenRouterModels,
   retry: () => retry
@@ -48,8 +59,31 @@ async function getOpenRouterModelTokenLimits(modelId) {
 }
 
 // src/helpers/retry.ts
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+var import_typebox = require("@sinclair/typebox");
+var import_ubiquity_os_logger = require("@ubiquity-os/ubiquity-os-logger");
+var import_ms = __toESM(require("ms"));
+function sleep(ms2) {
+  return new Promise((resolve) => setTimeout(resolve, ms2));
+}
+async function handleRetryError(err, delay, options, isLastLoop) {
+  const lastError = err;
+  if (options.onError) {
+    await options.onError(err);
+  }
+  let shouldRetry;
+  if (options.isErrorRetryable) {
+    shouldRetry = await options.isErrorRetryable(err);
+  }
+  if (shouldRetry === false || isLastLoop) {
+    throw lastError;
+  }
+  if (typeof shouldRetry === "number" && Number.isFinite(shouldRetry)) {
+    await sleep(shouldRetry);
+  } else {
+    await sleep(delay);
+    delay *= 2;
+  }
+  return { delay, lastError };
 }
 async function retry(fn, options) {
   let delay = 1e3;
@@ -58,28 +92,117 @@ async function retry(fn, options) {
     try {
       return await fn();
     } catch (err) {
-      lastError = err;
-      if (options.onError) {
-        await options.onError(err);
-      }
-      let shouldRetry;
-      if (options.isErrorRetryable) {
-        shouldRetry = await options.isErrorRetryable(err);
-      }
-      if (shouldRetry === false) {
-        throw lastError;
-      } else if (typeof shouldRetry === "number" && Number.isFinite(shouldRetry)) {
-        await sleep(shouldRetry);
-      } else {
-        await sleep(delay);
-        delay *= 2;
-      }
+      const result = await handleRetryError(err, delay, options, i >= options.maxRetries);
+      delay = result.delay;
+      lastError = result.lastError;
     }
   }
   throw lastError;
 }
+function checkLlmRetryableState(error) {
+  if (error instanceof SyntaxError || error instanceof import_typebox.TypeBoxError || error instanceof import_ubiquity_os_logger.LogReturn) {
+    return true;
+  }
+  const status = extractStatus(error) ?? extractStatusFromMessage(error);
+  if (!status) return false;
+  if (status === 429) {
+    const headers = extractHeaders(error);
+    const tokenDelay = parseRetryAfter(headers, "x-ratelimit-reset-tokens");
+    const requestDelay = parseRetryAfter(headers, "x-ratelimit-reset-requests");
+    const retryAfter = parseRetryAfter(headers, "retry-after");
+    const delays = [tokenDelay, requestDelay, retryAfter].filter((value) => Number.isFinite(value));
+    if (!delays.length) return true;
+    return Math.max(...delays);
+  }
+  return status >= 500;
+}
+function extractStatus(error) {
+  const direct = getStatusFromSource(error);
+  if (direct !== null) return direct;
+  if (typeof error !== "object" || error === null || !("cause" in error)) return null;
+  return getStatusFromSource(error.cause);
+}
+function getStatusFromSource(source) {
+  if (typeof source !== "object" || source === null) return null;
+  const maybeError = source;
+  const candidates = [maybeError.status, maybeError.statusCode, maybeError.response?.status];
+  for (const candidate of candidates) {
+    if (typeof candidate === "number") return candidate;
+    if (typeof candidate === "string" && candidate.trim()) {
+      const parsed = Number.parseInt(candidate, 10);
+      if (Number.isFinite(parsed)) return parsed;
+    }
+  }
+  return null;
+}
+function extractStatusFromMessage(error) {
+  const message = extractMessage(error);
+  if (!message) return null;
+  const match = STATUS_FROM_MESSAGE_REGEX.exec(message);
+  if (!match) return null;
+  const status = Number(match[1]);
+  return Number.isFinite(status) ? status : null;
+}
+function extractMessage(error) {
+  if (typeof error === "string") return error;
+  if (typeof error !== "object" || error === null || !("message" in error)) return void 0;
+  const maybeMessage = error.message;
+  return typeof maybeMessage === "string" ? maybeMessage : void 0;
+}
+function extractHeaders(error) {
+  if (typeof error !== "object" || error === null) return void 0;
+  const maybeError = error;
+  if (maybeError.headers) return maybeError.headers;
+  if (maybeError.response?.headers) return maybeError.response.headers;
+  const maybeCause = maybeError.cause;
+  if (typeof maybeCause === "object" && maybeCause !== null) {
+    const cause = maybeCause;
+    if (cause.headers) return cause.headers;
+    if (cause.response?.headers) return cause.response.headers;
+  }
+  return void 0;
+}
+function parseRetryAfter(headers, headerName) {
+  const value = getHeaderValue(headers, headerName);
+  if (!value) return null;
+  const delay = parseDelayMs(value, headerName.toLowerCase() === "retry-after");
+  return Number.isFinite(delay) ? delay : null;
+}
+function getHeaderValue(headers, headerName) {
+  if (!headers || typeof headers !== "object") return void 0;
+  const maybeHeaders = headers;
+  if (typeof maybeHeaders.get === "function") {
+    const value = maybeHeaders.get(headerName);
+    return typeof value === "string" ? value : void 0;
+  }
+  const direct = maybeHeaders[headerName] ?? maybeHeaders[headerName.toLowerCase()] ?? maybeHeaders[headerName.toUpperCase()];
+  return typeof direct === "string" ? direct : void 0;
+}
+var STATUS_FROM_MESSAGE_REGEX = /\b(?:status(?: code)?|http|error)\b\D*(\d{3})(?!\d)/i;
+function parseDelayMs(value, numericIsSeconds) {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  if (isNumericString(trimmed)) {
+    const numeric = Number(trimmed);
+    if (!Number.isFinite(numeric)) return null;
+    return numericIsSeconds ? numeric * 1e3 : numeric;
+  }
+  const duration = (0, import_ms.default)(trimmed);
+  if (Number.isFinite(duration)) return duration;
+  return parseDateDelay(trimmed);
+}
+function parseDateDelay(value) {
+  const parsedDate = Date.parse(value);
+  if (Number.isNaN(parsedDate)) return null;
+  const delay = parsedDate - Date.now();
+  return delay > 0 ? delay : 0;
+}
+function isNumericString(value) {
+  return /^\d+(?:\.\d+)?$/.test(value);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkLlmRetryableState,
   getOpenRouterModelTokenLimits,
   getOpenRouterModels,
   retry

package/dist/helpers.mjs

@@ -20,8 +20,31 @@ async function getOpenRouterModelTokenLimits(modelId) {
 }
 
 // src/helpers/retry.ts
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+import { TypeBoxError } from "@sinclair/typebox";
+import { LogReturn } from "@ubiquity-os/ubiquity-os-logger";
+import ms from "ms";
+function sleep(ms2) {
+  return new Promise((resolve) => setTimeout(resolve, ms2));
+}
+async function handleRetryError(err, delay, options, isLastLoop) {
+  const lastError = err;
+  if (options.onError) {
+    await options.onError(err);
+  }
+  let shouldRetry;
+  if (options.isErrorRetryable) {
+    shouldRetry = await options.isErrorRetryable(err);
+  }
+  if (shouldRetry === false || isLastLoop) {
+    throw lastError;
+  }
+  if (typeof shouldRetry === "number" && Number.isFinite(shouldRetry)) {
+    await sleep(shouldRetry);
+  } else {
+    await sleep(delay);
+    delay *= 2;
+  }
+  return { delay, lastError };
 }
 async function retry(fn, options) {
   let delay = 1e3;
@@ -30,27 +53,116 @@ async function retry(fn, options) {
     try {
       return await fn();
     } catch (err) {
-      lastError = err;
-      if (options.onError) {
-        await options.onError(err);
-      }
-      let shouldRetry;
-      if (options.isErrorRetryable) {
-        shouldRetry = await options.isErrorRetryable(err);
-      }
-      if (shouldRetry === false) {
-        throw lastError;
-      } else if (typeof shouldRetry === "number" && Number.isFinite(shouldRetry)) {
-        await sleep(shouldRetry);
-      } else {
-        await sleep(delay);
-        delay *= 2;
-      }
+      const result = await handleRetryError(err, delay, options, i >= options.maxRetries);
+      delay = result.delay;
+      lastError = result.lastError;
     }
   }
   throw lastError;
 }
+function checkLlmRetryableState(error) {
+  if (error instanceof SyntaxError || error instanceof TypeBoxError || error instanceof LogReturn) {
+    return true;
+  }
+  const status = extractStatus(error) ?? extractStatusFromMessage(error);
+  if (!status) return false;
+  if (status === 429) {
+    const headers = extractHeaders(error);
+    const tokenDelay = parseRetryAfter(headers, "x-ratelimit-reset-tokens");
+    const requestDelay = parseRetryAfter(headers, "x-ratelimit-reset-requests");
+    const retryAfter = parseRetryAfter(headers, "retry-after");
+    const delays = [tokenDelay, requestDelay, retryAfter].filter((value) => Number.isFinite(value));
+    if (!delays.length) return true;
+    return Math.max(...delays);
+  }
+  return status >= 500;
+}
+function extractStatus(error) {
+  const direct = getStatusFromSource(error);
+  if (direct !== null) return direct;
+  if (typeof error !== "object" || error === null || !("cause" in error)) return null;
+  return getStatusFromSource(error.cause);
+}
+function getStatusFromSource(source) {
+  if (typeof source !== "object" || source === null) return null;
+  const maybeError = source;
+  const candidates = [maybeError.status, maybeError.statusCode, maybeError.response?.status];
+  for (const candidate of candidates) {
+    if (typeof candidate === "number") return candidate;
+    if (typeof candidate === "string" && candidate.trim()) {
+      const parsed = Number.parseInt(candidate, 10);
+      if (Number.isFinite(parsed)) return parsed;
+    }
+  }
+  return null;
+}
+function extractStatusFromMessage(error) {
+  const message = extractMessage(error);
+  if (!message) return null;
+  const match = STATUS_FROM_MESSAGE_REGEX.exec(message);
+  if (!match) return null;
+  const status = Number(match[1]);
+  return Number.isFinite(status) ? status : null;
+}
+function extractMessage(error) {
+  if (typeof error === "string") return error;
+  if (typeof error !== "object" || error === null || !("message" in error)) return void 0;
+  const maybeMessage = error.message;
+  return typeof maybeMessage === "string" ? maybeMessage : void 0;
+}
+function extractHeaders(error) {
+  if (typeof error !== "object" || error === null) return void 0;
+  const maybeError = error;
+  if (maybeError.headers) return maybeError.headers;
+  if (maybeError.response?.headers) return maybeError.response.headers;
+  const maybeCause = maybeError.cause;
+  if (typeof maybeCause === "object" && maybeCause !== null) {
+    const cause = maybeCause;
+    if (cause.headers) return cause.headers;
+    if (cause.response?.headers) return cause.response.headers;
+  }
+  return void 0;
+}
+function parseRetryAfter(headers, headerName) {
+  const value = getHeaderValue(headers, headerName);
+  if (!value) return null;
+  const delay = parseDelayMs(value, headerName.toLowerCase() === "retry-after");
+  return Number.isFinite(delay) ? delay : null;
+}
+function getHeaderValue(headers, headerName) {
+  if (!headers || typeof headers !== "object") return void 0;
+  const maybeHeaders = headers;
+  if (typeof maybeHeaders.get === "function") {
+    const value = maybeHeaders.get(headerName);
+    return typeof value === "string" ? value : void 0;
+  }
+  const direct = maybeHeaders[headerName] ?? maybeHeaders[headerName.toLowerCase()] ?? maybeHeaders[headerName.toUpperCase()];
+  return typeof direct === "string" ? direct : void 0;
+}
+var STATUS_FROM_MESSAGE_REGEX = /\b(?:status(?: code)?|http|error)\b\D*(\d{3})(?!\d)/i;
+function parseDelayMs(value, numericIsSeconds) {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  if (isNumericString(trimmed)) {
+    const numeric = Number(trimmed);
+    if (!Number.isFinite(numeric)) return null;
+    return numericIsSeconds ? numeric * 1e3 : numeric;
+  }
+  const duration = ms(trimmed);
+  if (Number.isFinite(duration)) return duration;
+  return parseDateDelay(trimmed);
+}
+function parseDateDelay(value) {
+  const parsedDate = Date.parse(value);
+  if (Number.isNaN(parsedDate)) return null;
+  const delay = parsedDate - Date.now();
+  return delay > 0 ? delay : 0;
+}
+function isNumericString(value) {
+  return /^\d+(?:\.\d+)?$/.test(value);
+}
 export {
+  checkLlmRetryableState,
   getOpenRouterModelTokenLimits,
   getOpenRouterModels,
   retry

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ubiquity-os/plugin-sdk",
-  "version": "3.11.2",
+  "version": "3.12.1",
   "description": "SDK for plugin support.",
   "author": "Ubiquity DAO",
   "license": "MIT",
@@ -121,6 +121,7 @@
     "@ubiquity-os/ubiquity-os-logger": "^1.4.0",
     "hono": "^4.10.6",
     "js-yaml": "^4.1.1",
+    "ms": "^2.1.3",
     "openai": "^6.15.0"
   },
   "peerDependencies": {