@pi-oxide/extension-js 0.4.1 → 0.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pi-oxide/extension-js",
 	"type": "module",
-	"version": "0.4.1",
+	"version": "0.5.0",
 	"license": "LicenseRef-PiccoloNotebook-Fair-BYOK-1.0",
 	"main": "index.js",
 	"types": "index.d.ts",

package/worker.js

@@ -1,5 +1,5 @@
-import x, { setLogLevel as C, ExtensionSession as ee, registerJsCallBatch as re } from "./extension_js.js";
-const T = {
+import x, { setLogLevel as L, ExtensionSession as ee, registerJsCallBatch as re } from "./extension_js.js";
+const I = {
   trace: 0,
   debug: 1,
   info: 2,
@@ -18,15 +18,15 @@ function se(r) {
   const e = Math.max(0, Math.min(5, Math.round(r)));
   return te[e] ?? "error";
 }
-let P = "trace", L = null;
+let P = "trace", C = null;
 function ne(r) {
-  P = r, L && L(T[r]);
-}
-function ae(r) {
-  L = r, r(T[P]);
+  P = r, C && C(I[r]);
 }
 function oe(r) {
-  return T[r] >= T[P];
+  C = r, r(I[P]);
+}
+function ae(r) {
+  return I[r] >= I[P];
 }
 function V(r, e = "info") {
   var s;
@@ -65,7 +65,7 @@ function le(r, e) {
   }
   return s.length > 0 ? ` ${s.join(" ")}` : "";
 }
-function E(r, e) {
+function b(r, e) {
   return e.length === 0 ? { event: r } : e.length === 1 && typeof e[0] == "object" && e[0] !== null && !Array.isArray(e[0]) ? { event: r, metadata: e[0] } : {
     event: r,
     metadata: { _args: e.map((s) => V(s)).join(" ") }
@@ -77,8 +77,8 @@ class $ {
   }
   log(e, s, t) {
     try {
-      if (!oe(e)) return;
-      const n = ie(this.namespace), o = le(t, e), i = `${n} ${s}${o}`;
+      if (!ae(e)) return;
+      const n = ie(this.namespace), a = le(t, e), i = `${n} ${s}${a}`;
       switch (e) {
         case "trace":
         case "debug":
@@ -94,7 +94,7 @@ class $ {
         case "none":
           break;
         default: {
-          const a = e;
+          const o = e;
           break;
         }
       }
@@ -102,33 +102,33 @@ class $ {
     }
   }
   trace(e, ...s) {
-    const { event: t, metadata: n } = E(e, s);
+    const { event: t, metadata: n } = b(e, s);
     this.log("trace", t, n);
   }
   debug(e, ...s) {
-    const { event: t, metadata: n } = E(e, s);
+    const { event: t, metadata: n } = b(e, s);
     this.log("debug", t, n);
   }
   info(e, ...s) {
-    const { event: t, metadata: n } = E(e, s);
+    const { event: t, metadata: n } = b(e, s);
     this.log("info", t, n);
   }
   warn(e, ...s) {
-    const { event: t, metadata: n } = E(e, s);
+    const { event: t, metadata: n } = b(e, s);
     this.log("warn", t, n);
   }
   error(e, ...s) {
-    const { event: t, metadata: n } = E(e, s);
+    const { event: t, metadata: n } = b(e, s);
     this.log("error", t, n);
   }
   child(e) {
     return new $(`${this.namespace}.${e}`);
   }
   timer(e, s, t = "info") {
-    const n = typeof performance < "u" && performance.now, o = n ? performance.now() : Date.now();
+    const n = typeof performance < "u" && performance.now, a = n ? performance.now() : Date.now();
     return (i) => {
       try {
-        const a = n ? performance.now() : Date.now(), g = Math.round(a - o), u = {
+        const o = n ? performance.now() : Date.now(), g = Math.round(o - a), u = {
           ...s,
           ...i,
           duration_ms: g
@@ -139,35 +139,7 @@ class $ {
     };
   }
 }
-const l = new $("root"), ce = /* @__PURE__ */ new Set([
-  "page_url",
-  "page_title",
-  "page_click",
-  "page_fill",
-  "page_type",
-  "page_append",
-  "page_press",
-  "page_select",
-  "page_check",
-  "page_hover",
-  "page_unhover",
-  "page_scroll",
-  "page_scroll_to",
-  "page_dblclick",
-  "page_back",
-  "tab_click",
-  "tab_fill",
-  "tab_type",
-  "tab_press",
-  "tab_select",
-  "tab_check",
-  "tab_hover",
-  "tab_unhover",
-  "tab_scroll",
-  "tab_scroll_to",
-  "tab_dblclick",
-  "tab_back"
-]);
+const l = new $("root"), ce = /* @__PURE__ */ new Set();
 function ue(r) {
   return ce.has(r);
 }
@@ -193,7 +165,7 @@ function ye(r, e) {
     tabPolicy: ge(r)
   };
 }
-function _e(r) {
+function he(r) {
   for (const e of r)
     de(e.action, ye(e.action, e.owner));
 }
@@ -202,7 +174,7 @@ function k(r) {
     [...r.entries()].map(([e, s]) => [e, k(s)])
   ) : Array.isArray(r) ? r.map(k) : r;
 }
-function be(r) {
+function Ee(r) {
   return {
     action: r.action,
     namespace: r.namespace,
@@ -228,13 +200,17 @@ function be(r) {
     errorCode: r.errorCode,
     errorCategory: r.errorCategory ?? null,
     permission: r.permission ?? null,
-    example: r.example ?? null
+    example: r.example ?? null,
+    prerequisites: r.prerequisites ?? null,
+    notes: r.notes ?? null,
+    tags: r.tags ?? null,
+    relatedApis: r.relatedApis ?? null
   };
 }
 l.child("tool-registry");
-let _ = null, v = !1;
-const b = /* @__PURE__ */ new Map();
-function A(r, e) {
+let h = null, v = !1;
+const E = /* @__PURE__ */ new Map();
+function T(r, e) {
   try {
     return r.postMessage(e), !0;
   } catch (s) {
@@ -244,21 +220,21 @@ function A(r, e) {
 }
 const G = 1e3;
 function K(r, e, s) {
-  e === "main-thread" || e === "content-script" ? A(s, { type: "relayCancel", id: r, owner: e }) : A(s, { type: "registryCallCancel", id: r });
+  e === "main-thread" || e === "content-script" ? T(s, { type: "relayCancel", id: r, owner: e }) : T(s, { type: "registryCallCancel", id: r });
 }
-function z(r, e) {
-  for (const [s, t] of b)
+function q(r, e) {
+  for (const [s, t] of E)
     clearTimeout(t.timeoutId), K(s, t.owner, t.port), t.settle({
       ok: !1,
       error: { message: e, code: r }
-    }), b.delete(s);
+    }), E.delete(s);
 }
-const h = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
-let q = Promise.resolve(), f = null;
-function he(r) {
+const _ = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new Map();
+let z = Promise.resolve(), f = null;
+function _e(r) {
   l.trace("sessionQueue_enqueue");
-  const e = q.then(r);
-  return q = e.then(
+  const e = z.then(r);
+  return z = e.then(
     () => {
     },
     () => {
@@ -286,16 +262,16 @@ self.addEventListener("unhandledrejection", (r) => {
   l.error("worker_unhandled_rejection", { error: s }), Y(s);
 });
 function c(r, e) {
-  h.set(r, e);
+  _.set(r, e);
 }
-function Ee() {
+function be() {
   const r = new Uint8Array(16);
   return crypto.getRandomValues(r), Array.from(r, (e) => e.toString(16).padStart(2, "0")).join("");
 }
 function we(r) {
   return se(r);
 }
-const O = /* @__PURE__ */ new Map(), I = /* @__PURE__ */ new Map();
+const O = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Map();
 function ke(r, e) {
   var s;
   if (O.has(r))
@@ -303,20 +279,20 @@ function ke(r, e) {
   if (typeof e.addEventListener != "function")
     throw new Error(`Worker port for owner "${r}" cannot receive responses`);
   O.set(r, e), e.addEventListener("message", async (t) => {
-    var o;
+    var a;
     const n = t.data;
     if (n !== null && (n.type === "asyncRelayResult" || n.type === "registryCallResult") && typeof n.id == "string") {
       N(n.id, n.result);
       return;
     }
     if (n !== null && n.type === "registryCallCancel" && typeof n.id == "string") {
-      (o = I.get(n.id)) == null || o.abort(), I.delete(n.id);
+      (a = A.get(n.id)) == null || a.abort(), A.delete(n.id);
       return;
     }
     if (n !== null && n.type === "registryCall" && typeof n.id == "string" && typeof n.action == "string") {
-      const i = n.id, a = new AbortController();
-      I.set(i, a);
-      const g = h.get(n.action);
+      const i = n.id, o = new AbortController();
+      A.set(i, o);
+      const g = _.get(n.action);
       let u;
       if (!g)
         u = {
@@ -329,19 +305,19 @@ function ke(r, e) {
             action: n.action,
             callId: n.callId,
             runId: n.runId,
-            signal: a.signal
+            signal: o.signal
           });
-          u = a.signal.aborted ? { ok: !1, error: { message: "Relay aborted", code: "E_ABORT" } } : { ok: !0, value: d };
+          u = o.signal.aborted ? { ok: !1, error: { message: "Relay aborted", code: "E_ABORT" } } : { ok: !0, value: d };
         } catch (d) {
           u = {
             ok: !1,
             error: {
               message: d instanceof Error ? d.message : String(d),
-              code: a.signal.aborted ? "E_ABORT" : "E_WORKER_HANDLER"
+              code: o.signal.aborted ? "E_ABORT" : "E_WORKER_HANDLER"
             }
           };
         }
-      I.delete(i), A(e, { type: "registryCallResult", id: i, result: u }) || N(i, {
+      A.delete(i), T(e, { type: "registryCallResult", id: i, result: u }) || N(i, {
         ok: !1,
         error: { message: "Failed to deliver worker handler response", code: "E_PORT" }
       });
@@ -350,64 +326,64 @@ function ke(r, e) {
 }
 function N(r, e) {
   l.trace("resolveAsyncRelayResult", { id: r });
-  const s = b.get(r);
+  const s = E.get(r);
   return s ? (s.settle(e), !0) : (l.warn("asyncRelayResult_no_pending_relay", { id: r }), !1);
 }
-function Re(r) {
+function Me(r) {
   if (r === "main-thread" || r === "content-script")
     return self;
   const e = O.get(r);
   return e || null;
 }
 function Q(r) {
-  const { owner: e, action: s, tabPolicy: t, resolveTimeoutMs: n } = r, o = r.timeoutMs ?? w;
-  return (i, a) => {
-    l.trace("safePostAsCall_invoke", { owner: e, action: s, callId: a == null ? void 0 : a.callId, runId: a == null ? void 0 : a.runId });
-    const g = (n == null ? void 0 : n(i)) ?? o;
+  const { owner: e, action: s, tabPolicy: t, resolveTimeoutMs: n } = r, a = r.timeoutMs ?? w;
+  return (i, o) => {
+    l.trace("safePostAsCall_invoke", { owner: e, action: s, callId: o == null ? void 0 : o.callId, runId: o == null ? void 0 : o.runId });
+    const g = (n == null ? void 0 : n(i)) ?? a;
     return new Promise((u, d) => {
       var j;
-      if ((j = a == null ? void 0 : a.signal) != null && j.aborted) {
+      if ((j = o == null ? void 0 : o.signal) != null && j.aborted) {
         const m = new Error(`Relay aborted for action: ${s}`);
         m.code = "E_ABORT", d(m);
         return;
       }
-      const y = Re(e);
+      const y = Me(e);
       if (!y) {
         d(new Error(`No port available for action: ${s}`));
         return;
       }
-      if (b.size >= G) {
+      if (E.size >= G) {
         d(new Error(
           `Too many pending calls (${G} limit exceeded). Action: ${s}`
         ));
         return;
       }
-      const R = Ee();
+      const M = be();
       let W = !1;
-      const M = (m) => {
-        W || (W = !0, clearTimeout(U), a != null && a.signal && a.signal.removeEventListener("abort", S), b.delete(R), m());
+      const R = (m) => {
+        W || (W = !0, clearTimeout(U), o != null && o.signal && o.signal.removeEventListener("abort", S), E.delete(M), m());
       }, D = () => {
-        K(R, e, y);
+        K(M, e, y);
       }, S = () => {
         D();
         const m = new Error(`Relay aborted for action: ${s}`);
-        m.code = "E_ABORT", M(() => d(m));
+        m.code = "E_ABORT", R(() => d(m));
       };
-      a != null && a.signal && a.signal.addEventListener("abort", S);
+      o != null && o.signal && o.signal.addEventListener("abort", S);
       const U = setTimeout(() => {
-        D(), M(() => d(new Error(`Relay timeout for action: ${s}`)));
+        D(), R(() => d(new Error(`Relay timeout for action: ${s}`)));
       }, g);
-      b.set(R, {
-        settle: (m) => M(() => u(m)),
+      E.set(M, {
+        settle: (m) => R(() => u(m)),
         timeoutId: U,
         abort: S,
         owner: e,
         port: y
       });
-      const F = a == null ? void 0 : a.runId, B = a == null ? void 0 : a.callId;
-      A(y, {
+      const F = o == null ? void 0 : o.runId, B = o == null ? void 0 : o.callId;
+      T(y, {
         type: e === "main-thread" || e === "content-script" ? "asyncRelay" : "registryCall",
-        id: R,
+        id: M,
         owner: e,
         action: s,
         params: i,
@@ -415,11 +391,11 @@ function Q(r) {
         tabPolicy: t,
         command: { action: s, params: i, runId: F, callId: B },
         runId: F
-      }) || M(() => d(new Error(`Failed to post relay for action: ${s}`)));
+      }) || R(() => d(new Error(`Failed to post relay for action: ${s}`)));
     });
   };
 }
-const Me = "worker", w = 3e4, H = 5e3, Ie = 500, Te = {
+const Re = "worker", w = 3e4, H = 5e3, Ae = 500, Ie = {
   page_goto: "timeout",
   page_wait_for: "timeout",
   tab_wait_for_load: "timeout",
@@ -428,26 +404,26 @@ const Me = "worker", w = 3e4, H = 5e3, Ie = 500, Te = {
   page_wait: "duration",
   sidepanel_wait: "duration"
 }, X = /* @__PURE__ */ new Set(["page_goto"]);
-function Ae(r, e) {
+function Te(r, e) {
   if (r === null || typeof r != "object" || Array.isArray(r))
     return null;
   const s = r[e];
   return typeof s == "bigint" ? Number(s) : typeof s == "number" && Number.isFinite(s) ? s : null;
 }
 function Se(r, e) {
-  return X.has(r) ? e * 2 + Ie + H : e + H;
+  return X.has(r) ? e * 2 + Ae + H : e + H;
 }
 function Z(r, e) {
-  const s = Te[r];
+  const s = Ie[r];
   if (!s) return w;
-  let t = Ae(e, s);
+  let t = Te(e, s);
   return t === null && X.has(r) && (t = w), t === null ? w : Math.max(
     w,
     Se(r, t)
   );
 }
 function Ne(r, e) {
-  var o, i;
+  var a, i;
   r = k(r);
   const s = e == null ? void 0 : e.action;
   if (l.trace("extensionDispatch", { action: s, callId: e == null ? void 0 : e.callId, runId: e == null ? void 0 : e.runId }), !s)
@@ -455,11 +431,11 @@ function Ne(r, e) {
       ok: !1,
       error: { message: "Missing action in dispatch context", code: "E_MISSING_ACTION" }
     });
-  if (h.has(s)) {
-    const a = h.get(s), g = (e == null ? void 0 : e.signal) ?? (e != null && e.runId ? (o = p.get(e.runId)) == null ? void 0 : o.signal : void 0);
+  if (_.has(s)) {
+    const o = _.get(s), g = (e == null ? void 0 : e.signal) ?? (e != null && e.runId ? (a = p.get(e.runId)) == null ? void 0 : a.signal : void 0);
     return (async () => {
       try {
-        return { ok: !0, value: await a(r, { ...e, signal: g }) };
+        return { ok: !0, value: await o(r, { ...e, signal: g }) };
       } catch (u) {
         const d = u instanceof Error ? u.message : String(u), y = typeof u == "object" && u !== null && "code" in u && typeof u.code == "string" ? u.code : "E_WORKER_HANDLER";
         return { ok: !1, error: { message: d, code: y } };
@@ -470,7 +446,7 @@ function Ne(r, e) {
   return t ? Q({
     owner: t.endpoint,
     action: s,
-    resolveTimeoutMs: (a) => Z(s, a),
+    resolveTimeoutMs: (o) => Z(s, o),
     tabPolicy: t.tabPolicy
   })(r, {
     ...e,
@@ -480,22 +456,22 @@ function Ne(r, e) {
     error: { message: `No route registered for action: ${s}`, code: "E_NO_ROUTE" }
   });
 }
-function Ce(r) {
-  if (r.owner === Me) {
-    const e = h.get(r.action);
+function Le(r) {
+  if (r.owner === Re) {
+    const e = _.get(r.action);
     if (!e)
       throw new Error(
         `No worker-local handler registered for action: ${r.action}`
       );
     return async (s, t) => {
-      var o;
+      var a;
       s = k(s);
-      const n = (t == null ? void 0 : t.signal) ?? (t != null && t.runId ? (o = p.get(t.runId)) == null ? void 0 : o.signal : void 0);
+      const n = (t == null ? void 0 : t.signal) ?? (t != null && t.runId ? (a = p.get(t.runId)) == null ? void 0 : a.signal : void 0);
       try {
         return { ok: !0, value: await e(s, { ...t, action: r.action, signal: n }) };
       } catch (i) {
-        const a = i instanceof Error ? i.message : String(i), g = typeof i == "object" && i !== null && "code" in i && typeof i.code == "string" ? i.code : r.errorCode;
-        return { ok: !1, error: { message: a, code: g } };
+        const o = i instanceof Error ? i.message : String(i), g = typeof i == "object" && i !== null && "code" in i && typeof i.code == "string" ? i.code : r.errorCode;
+        return { ok: !1, error: { message: o, code: g } };
       }
     };
   } else {
@@ -513,33 +489,33 @@ function Ce(r) {
     };
   }
 }
-function Le(r) {
+function Ce(r) {
   c("exists", (e) => r.fsExists(e)), c("stat", (e) => r.fsStat(e)), c("read", (e) => r.fsRead(e)), c("readText", (e) => r.fsReadText(e)), c("readBase64", (e) => r.fsReadBase64(e)), c("list", (e) => r.fsList(e)), c("mkdir", (e) => r.fsMkdir(e)), c("delete", (e) => r.fsDelete(e)), c("copy", (e) => r.fsCopy(e)), c("move", (e) => r.fsMove(e)), c("write", (e) => r.fsWrite(e)), c("writeText", (e) => r.fsWriteText(e)), c("writeBase64", (e) => r.fsWriteBase64(e)), c("append", (e) => r.fsAppend(e)), c("appendText", (e) => r.fsAppendText(e)), c("appendBase64", (e) => r.fsAppendBase64(e)), c("readRange", (e) => r.fsReadRange(e)), c("update", (e) => r.fsUpdate(e)), c("hash", (e) => r.fsHash(e));
 }
 async function ve(r, e) {
   if (v) return;
-  await x(), _ = new ee(), C(0), ae(C), l.trace("initWasm_start"), Le(_), _e(r);
-  const t = r.map((o) => ({
-    entry: be(o),
-    callback: Ce(o)
+  await x(), h = new ee(), L(0), oe(L), l.trace("initWasm_start"), Ce(h), he(r);
+  const t = r.map((a) => ({
+    entry: Ee(a),
+    callback: Le(a)
   }));
   try {
     re(t);
-  } catch (o) {
-    const i = o instanceof Error ? o.message : String(o);
+  } catch (a) {
+    const i = a instanceof Error ? a.message : String(a);
     throw new Error(`Registry registration failed: ${i}`);
   }
   const { freezeManifest: n } = await import("./extension_js.js");
   try {
     n();
-  } catch (o) {
-    const i = o instanceof Error ? o.message : String(o);
+  } catch (a) {
+    const i = a instanceof Error ? a.message : String(a);
     throw new Error(`Manifest freeze failed: ${i}`);
   }
-  if (_.injectRegistryBindings(), e) {
-    const o = JSON.stringify(e);
-    await _.runCellAsync(
-      `(function(){var r=globalThis.chrome&&globalThis.chrome.runtime;if(!r){r={};if(!globalThis.chrome)globalThis.chrome={};globalThis.chrome.runtime=r;}r.id=${o};})();`,
+  if (h.injectRegistryBindings(), e) {
+    const a = JSON.stringify(e);
+    await h.runCellAsync(
+      `(function(){var r=globalThis.chrome&&globalThis.chrome.runtime;if(!r){r={};if(!globalThis.chrome)globalThis.chrome={};globalThis.chrome.runtime=r;}r.id=${a};})();`,
       "",
       "inject-runtime-id"
     );
@@ -571,10 +547,10 @@ self.onmessage = async (r) => {
     return;
   }
   if (e.type === "setLogLevel") {
-    C(e.level), ne(we(e.level)), l.trace("set_log_level", { level: e.level });
+    L(e.level), ne(we(e.level)), l.trace("set_log_level", { level: e.level });
     return;
   }
-  if (!v || !_) {
+  if (!v || !h) {
     self.postMessage({
       type: "error",
       id: e.id,
@@ -582,26 +558,26 @@ self.onmessage = async (r) => {
     });
     return;
   }
-  const s = _;
-  await he(async () => {
+  const s = h;
+  await _e(async () => {
     switch (e.type) {
       case "runCell": {
         const t = e.runId, n = new AbortController();
         t && p.set(t, n), f = { id: e.id, runId: t }, l.trace("runCell_start", { runId: t, callId: e.id, codeLen: e.code.length });
         try {
-          const o = await s.runCellAsync(
+          const a = await s.runCellAsync(
             e.code,
             e.stdin || "",
             t || ""
           );
-          l.trace("runCell_done", { runId: t, callId: e.id, status: o.status }), self.postMessage({
+          l.trace("runCell_done", { runId: t, callId: e.id, status: a.status }), self.postMessage({
             type: "result",
             id: e.id,
-            data: o,
+            data: a,
             runId: t
           });
-        } catch (o) {
-          const i = o instanceof Error ? o.message : String(o);
+        } catch (a) {
+          const i = a instanceof Error ? a.message : String(a);
           l.error("runCell_error", { runId: t, error: i }), self.postMessage({
             type: "error",
             id: e.id,
@@ -616,7 +592,7 @@ self.onmessage = async (r) => {
       case "reset": {
         s.setAborted(!0);
         for (const t of p.values()) t.abort();
-        p.clear(), z("E_RESET", "Worker reset");
+        p.clear(), q("E_RESET", "Worker reset");
         try {
           s.reset(), self.postMessage({ type: "result", id: e.id, data: { ok: !0 } });
         } catch (t) {
@@ -628,7 +604,7 @@ self.onmessage = async (r) => {
       case "stop": {
         s.setAborted(!0);
         for (const t of p.values()) t.abort();
-        p.clear(), z("E_STOPPED", "Worker stopped"), self.postMessage({ type: "result", id: e.id, data: { ok: !0 } });
+        p.clear(), q("E_STOPPED", "Worker stopped"), self.postMessage({ type: "result", id: e.id, data: { ok: !0 } });
         break;
       }
       case "setFuelLimit": {
@@ -673,7 +649,7 @@ self.onmessage = async (r) => {
         break;
       }
       case "fsCall": {
-        const t = h.get(e.action);
+        const t = _.get(e.action);
         if (!t) {
           self.postMessage({
             type: "error",
@@ -686,8 +662,8 @@ self.onmessage = async (r) => {
           const n = await t(e.params);
           self.postMessage({ type: "result", id: e.id, data: n });
         } catch (n) {
-          const o = n instanceof Error ? n.message : String(n);
-          self.postMessage({ type: "error", id: e.id, error: o });
+          const a = n instanceof Error ? n.message : String(n);
+          self.postMessage({ type: "error", id: e.id, error: a });
         }
         break;
       }
@@ -700,12 +676,12 @@ self.onmessage = async (r) => {
 };
 export {
   w as DEFAULT_RELAY_TIMEOUT_MS,
-  Ce as createExecutableCallback,
+  Le as createExecutableCallback,
   Ne as extensionDispatch,
   c as registerWorkerHandler,
   ke as registerWorkerPort,
   N as resolveAsyncRelayResult,
   Z as resolveRelayTimeoutMs,
   Q as safePostAsCall,
-  z as settleAllPendingRelays
+  q as settleAllPendingRelays
 };