@omujs/omu 0.9.41 → 0.9.43

package/dist/esm/result.js

@@ -0,0 +1,68 @@
+// @bun
+// src/result.ts
+async function tryCatch(promise) {
+  try {
+    const data = await promise;
+    return { data, error: null };
+  } catch (error) {
+    return { data: null, error };
+  }
+}
+function success(data) {
+  return { data, error: null };
+}
+function failure(error) {
+  return { data: null, error };
+}
+
+class PromiseResult {
+  promise;
+  constructor(promise) {
+    this.promise = promise;
+  }
+  static create() {
+    let resolve = () => {};
+    let reject = () => {};
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return {
+      promise: new PromiseResult(promise),
+      resolve,
+      reject
+    };
+  }
+  then(onfulfilled, onrejected) {
+    return this.promise.then(onfulfilled, onrejected);
+  }
+  catch(onrejected) {
+    return this.promise.catch(onrejected);
+  }
+  finally(onfinally) {
+    return this.promise.finally(onfinally);
+  }
+  [Symbol.toStringTag] = "ResultPromise";
+  async toResult() {
+    try {
+      return {
+        data: await this.promise,
+        error: null
+      };
+    } catch (err) {
+      return {
+        data: null,
+        error: err
+      };
+    }
+  }
+}
+export {
+  tryCatch,
+  success,
+  failure,
+  PromiseResult
+};
+
+//# debugId=5468463432485D3964756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3Jlc3VsdC50cyJdLAogICJzb3VyY2VzQ29udGVudCI6IFsKICAgICJleHBvcnQgdHlwZSBTdWNjZXNzPFQ+ID0ge1xuICAgIGRhdGE6IFQ7XG4gICAgZXJyb3I6IG51bGw7XG59O1xuXG5leHBvcnQgdHlwZSBGYWlsdXJlPEU+ID0ge1xuICAgIGRhdGE6IG51bGw7XG4gICAgZXJyb3I6IEU7XG59O1xuXG5leHBvcnQgdHlwZSBSZXN1bHQ8VCwgRSA9IEVycm9yPiA9IFN1Y2Nlc3M8VD4gfCBGYWlsdXJlPEU+O1xuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gdHJ5Q2F0Y2g8VCwgRSA9IEVycm9yPihcbiAgICBwcm9taXNlOiBQcm9taXNlPFQ+LFxuKTogUHJvbWlzZTxSZXN1bHQ8VCwgRT4+IHtcbiAgICB0cnkge1xuICAgICAgICBjb25zdCBkYXRhID0gYXdhaXQgcHJvbWlzZTtcbiAgICAgICAgcmV0dXJuIHsgZGF0YSwgZXJyb3I6IG51bGwgfTtcbiAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgICByZXR1cm4geyBkYXRhOiBudWxsLCBlcnJvcjogZXJyb3IgYXMgRSB9O1xuICAgIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHN1Y2Nlc3M8VD4oZGF0YTogVCk6IFJlc3VsdDxUPiB7XG4gICAgcmV0dXJuIHsgZGF0YSwgZXJyb3I6IG51bGwgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZhaWx1cmU8RT4oZXJyb3I6IEUpOiBSZXN1bHQ8bnVsbCwgRT4ge1xuICAgIHJldHVybiB7IGRhdGE6IG51bGwsIGVycm9yIH07XG59XG5cbmV4cG9ydCBjbGFzcyBQcm9taXNlUmVzdWx0PFQsIEUgPSBFcnJvcj4gaW1wbGVtZW50cyBQcm9taXNlPFQ+IHtcbiAgICBwcml2YXRlIGNvbnN0cnVjdG9yKFxuICAgICAgICBwcml2YXRlIHJlYWRvbmx5IHByb21pc2U6IFByb21pc2U8VD4sXG4gICAgKSB7fVxuXG4gICAgcHVibGljIHN0YXRpYyBjcmVhdGU8VCwgRSA9IEVycm9yPigpOiB7IHByb21pc2U6IFByb21pc2VSZXN1bHQ8VCwgRT47IHJlc29sdmU6ICh2YWx1ZTogVCkgPT4gdm9pZDsgcmVqZWN0OiAoZXJyb3I6IEUpID0+IHZvaWQgfSB7XG4gICAgICAgIGxldCByZXNvbHZlOiAodmFsdWU6IFQpID0+IHZvaWQgPSAoKSA9PiB7fTtcbiAgICAgICAgbGV0IHJlamVjdDogKGVycm9yOiBFKSA9PiB2b2lkID0gKCkgPT4ge307XG4gICAgICAgIGNvbnN0IHByb21pc2UgPSBuZXcgUHJvbWlzZTxUPigocmVzLCByZWopID0+IHtcbiAgICAgICAgICAgIHJlc29sdmUgPSByZXM7XG4gICAgICAgICAgICByZWplY3QgPSByZWo7XG4gICAgICAgIH0pO1xuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgcHJvbWlzZTogbmV3IFByb21pc2VSZXN1bHQ8VCwgRT4ocHJvbWlzZSksXG4gICAgICAgICAgICByZXNvbHZlLFxuICAgICAgICAgICAgcmVqZWN0LFxuICAgICAgICB9O1xuICAgIH1cblxuICAgIHRoZW48VFJlc3VsdDEgPSBULCBUUmVzdWx0MiA9IG5ldmVyPihvbmZ1bGZpbGxlZD86ICgodmFsdWU6IFQpID0+IFRSZXN1bHQxIHwgUHJvbWlzZUxpa2U8VFJlc3VsdDE+KSB8IG51bGwgfCB1bmRlZmluZWQsIG9ucmVqZWN0ZWQ/OiAoKHJlYXNvbjogRSkgPT4gVFJlc3VsdDIgfCBQcm9taXNlTGlrZTxUUmVzdWx0Mj4pIHwgbnVsbCB8IHVuZGVmaW5lZCk6IFByb21pc2U8VFJlc3VsdDEgfCBUUmVzdWx0Mj4ge1xuICAgICAgICByZXR1cm4gdGhpcy5wcm9taXNlLnRoZW4ob25mdWxmaWxsZWQsIG9ucmVqZWN0ZWQpO1xuICAgIH1cblxuICAgIGNhdGNoPFRSZXN1bHQgPSBuZXZlcj4ob25yZWplY3RlZD86ICgocmVhc29uOiBFKSA9PiBUUmVzdWx0IHwgUHJvbWlzZUxpa2U8VFJlc3VsdD4pIHwgbnVsbCB8IHVuZGVmaW5lZCk6IFByb21pc2U8VCB8IFRSZXN1bHQ+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMucHJvbWlzZS5jYXRjaChvbnJlamVjdGVkKTtcbiAgICB9XG5cbiAgICBmaW5hbGx5KG9uZmluYWxseT86ICgoKSA9PiB2b2lkKSB8IG51bGwgfCB1bmRlZmluZWQpOiBQcm9taXNlPFQ+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMucHJvbWlzZS5maW5hbGx5KG9uZmluYWxseSk7XG4gICAgfVxuXG4gICAgW1N5bWJvbC50b1N0cmluZ1RhZ106IHN0cmluZyA9ICdSZXN1bHRQcm9taXNlJztcblxuICAgIGFzeW5jIHRvUmVzdWx0KCk6IFByb21pc2U8UmVzdWx0PFQsIEU+PiB7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAgIGRhdGE6IGF3YWl0IHRoaXMucHJvbWlzZSxcbiAgICAgICAgICAgICAgICBlcnJvcjogbnVsbCxcbiAgICAgICAgICAgIH07XG4gICAgICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgICBkYXRhOiBudWxsLFxuICAgICAgICAgICAgICAgIGVycm9yOiBlcnIgYXMgRSxcbiAgICAgICAgICAgIH07XG4gICAgICAgIH1cbiAgICB9XG59XG4iCiAgXSwKICAibWFwcGluZ3MiOiAiOztBQVlBLGVBQXNCLFFBQXNCLENBQ3hDLFNBQ3FCO0FBQUEsRUFDckIsSUFBSTtBQUFBLElBQ0EsTUFBTSxPQUFPLE1BQU07QUFBQSxJQUNuQixPQUFPLEVBQUUsTUFBTSxPQUFPLEtBQUs7QUFBQSxJQUM3QixPQUFPLE9BQU87QUFBQSxJQUNaLE9BQU8sRUFBRSxNQUFNLE1BQU0sTUFBa0I7QUFBQTtBQUFBO0FBSXhDLFNBQVMsT0FBVSxDQUFDLE1BQW9CO0FBQUEsRUFDM0MsT0FBTyxFQUFFLE1BQU0sT0FBTyxLQUFLO0FBQUE7QUFHeEIsU0FBUyxPQUFVLENBQUMsT0FBMkI7QUFBQSxFQUNsRCxPQUFPLEVBQUUsTUFBTSxNQUFNLE1BQU07QUFBQTtBQUFBO0FBR3hCLE1BQU0sY0FBa0Q7QUFBQSxFQUV0QztBQUFBLEVBRGIsV0FBVyxDQUNFLFNBQ25CO0FBQUEsSUFEbUI7QUFBQTtBQUFBLFNBR1AsTUFBb0IsR0FBOEY7QUFBQSxJQUM1SCxJQUFJLFVBQThCLE1BQU07QUFBQSxJQUN4QyxJQUFJLFNBQTZCLE1BQU07QUFBQSxJQUN2QyxNQUFNLFVBQVUsSUFBSSxRQUFXLENBQUMsS0FBSyxRQUFRO0FBQUEsTUFDekMsVUFBVTtBQUFBLE1BQ1YsU0FBUztBQUFBLEtBQ1o7QUFBQSxJQUNELE9BQU87QUFBQSxNQUNILFNBQVMsSUFBSSxjQUFvQixPQUFPO0FBQUEsTUFDeEM7QUFBQSxNQUNBO0FBQUEsSUFDSjtBQUFBO0FBQUEsRUFHSixJQUFvQyxDQUFDLGFBQW1GLFlBQWlIO0FBQUEsSUFDck8sT0FBTyxLQUFLLFFBQVEsS0FBSyxhQUFhLFVBQVU7QUFBQTtBQUFBLEVBR3BELEtBQXNCLENBQUMsWUFBdUc7QUFBQSxJQUMxSCxPQUFPLEtBQUssUUFBUSxNQUFNLFVBQVU7QUFBQTtBQUFBLEVBR3hDLE9BQU8sQ0FBQyxXQUF5RDtBQUFBLElBQzdELE9BQU8sS0FBSyxRQUFRLFFBQVEsU0FBUztBQUFBO0FBQUEsR0FHeEMsT0FBTyxlQUF1QjtBQUFBLE9BRXpCLFNBQVEsR0FBMEI7QUFBQSxJQUNwQyxJQUFJO0FBQUEsTUFDQSxPQUFPO0FBQUEsUUFDSCxNQUFNLE1BQU0sS0FBSztBQUFBLFFBQ2pCLE9BQU87QUFBQSxNQUNYO0FBQUEsTUFDRixPQUFPLEtBQUs7QUFBQSxNQUNWLE9BQU87QUFBQSxRQUNILE1BQU07QUFBQSxRQUNOLE9BQU87QUFBQSxNQUNYO0FBQUE7QUFBQTtBQUdaOyIsCiAgImRlYnVnSWQiOiAiNTQ2ODQ2MzQzMjQ4NUQzOTY0NzU2RTIxNjQ3NTZFMjEiLAogICJuYW1lcyI6IFtdCn0=

package/dist/esm/token.js

@@ -9,12 +9,9 @@ function tryCatch(func) {
 }
 
 // src/token.ts
-class BrowserTokenProvider {
-  static TOKEN_PARAM_KEY = "_omu_session";
-  getKey(address, app) {
-    return JSON.stringify([address.host, address.port, address.hash ?? "", app.id.key()]);
-  }
-  async get(address, app) {
+class BrowserSession {
+  static PARAM_NAME = "_omu_session";
+  async get(address) {
     const foundToken = this.parseParamSession(address);
     if (foundToken)
       return foundToken;
@@ -22,7 +19,7 @@ class BrowserTokenProvider {
   }
   parseParamSession(address) {
     const searchParams = new URLSearchParams(location.search);
-    const param = searchParams.get(BrowserTokenProvider.TOKEN_PARAM_KEY);
+    const param = searchParams.get(BrowserSession.PARAM_NAME);
     if (!param)
       return;
     const { ok, data: session } = tryCatch(() => JSON.parse(param));
@@ -38,8 +35,8 @@ class BrowserTokenProvider {
   }
 }
 export {
-  BrowserTokenProvider
+  BrowserSession
 };
 
-//# debugId=D80F3ACCD7BEF08A64756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2hlbHBlci50cyIsICIuLi8uLi9zcmMvdG9rZW4udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAidHlwZSBPazxUPiA9IHtcbiAgICBvazogdHJ1ZTtcbiAgICBkYXRhOiBUO1xufTtcbnR5cGUgRXJyPEU+ID0ge1xuICAgIG9rOiBmYWxzZTtcbiAgICBkYXRhOiBFO1xufTtcblxuZXhwb3J0IGZ1bmN0aW9uIHRyeUNhdGNoPFQsIEUgPSBFcnJvcj4oZnVuYzogKCkgPT4gVCk6IE9rPFQ+IHwgRXJyPEU+IHtcbiAgICB0cnkge1xuICAgICAgICByZXR1cm4geyBvazogdHJ1ZSwgZGF0YTogZnVuYygpIH07XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgICByZXR1cm4geyBvazogZmFsc2UsIGRhdGE6IGUgYXMgRSB9O1xuICAgIH1cbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBBZGRyZXNzIH0gZnJvbSAnLi9hZGRyZXNzLmpzJztcblxuaW1wb3J0IHR5cGUgeyBBcHAgfSBmcm9tICcuL2FwcC5qcyc7XG5pbXBvcnQgeyB0cnlDYXRjaCB9IGZyb20gJy4vaGVscGVyLmpzJztcblxuZXhwb3J0IGludGVyZmFjZSBUb2tlblByb3ZpZGVyIHtcbiAgICBnZXQoc2VydmVyQWRkcmVzczogQWRkcmVzcywgYXBwOiBBcHApOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD47XG59XG5cbmV4cG9ydCB0eXBlIFNlc3Npb25QYXJhbSA9IHtcbiAgICBhZGRyZXNzOiBBZGRyZXNzO1xuICAgIHRva2VuOiBzdHJpbmc7XG59O1xuXG5leHBvcnQgY2xhc3MgQnJvd3NlclRva2VuUHJvdmlkZXIgaW1wbGVtZW50cyBUb2tlblByb3ZpZGVyIHtcbiAgICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IFRPS0VOX1BBUkFNX0tFWSA9ICdfb211X3Nlc3Npb24nO1xuXG4gICAgcHJpdmF0ZSBnZXRLZXkoYWRkcmVzczogQWRkcmVzcywgYXBwOiBBcHApOiBzdHJpbmcge1xuICAgICAgICByZXR1cm4gSlNPTi5zdHJpbmdpZnkoW2FkZHJlc3MuaG9zdCwgYWRkcmVzcy5wb3J0LCBhZGRyZXNzLmhhc2ggPz8gJycsIGFwcC5pZC5rZXkoKV0pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXQoYWRkcmVzczogQWRkcmVzcywgYXBwOiBBcHApOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD4ge1xuICAgICAgICBjb25zdCBmb3VuZFRva2VuID0gdGhpcy5wYXJzZVBhcmFtU2Vzc2lvbihhZGRyZXNzKTtcbiAgICAgICAgaWYgKGZvdW5kVG9rZW4pIHJldHVybiBmb3VuZFRva2VuO1xuICAgICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBwYXJzZVBhcmFtU2Vzc2lvbihhZGRyZXNzOiBBZGRyZXNzKTogc3RyaW5nIHwgdW5kZWZpbmVkIHtcbiAgICAgICAgY29uc3Qgc2VhcmNoUGFyYW1zID0gbmV3IFVSTFNlYXJjaFBhcmFtcyhsb2NhdGlvbi5zZWFyY2gpO1xuICAgICAgICBjb25zdCBwYXJhbSA9IHNlYXJjaFBhcmFtcy5nZXQoQnJvd3NlclRva2VuUHJvdmlkZXIuVE9LRU5fUEFSQU1fS0VZKTtcbiAgICAgICAgaWYgKCFwYXJhbSkgcmV0dXJuO1xuICAgICAgICBjb25zdCB7IG9rLCBkYXRhOiBzZXNzaW9uIH0gPSB0cnlDYXRjaDxTZXNzaW9uUGFyYW0+KCgpID0+IEpTT04ucGFyc2UocGFyYW0pKTtcbiAgICAgICAgaWYgKCFvaykge1xuICAgICAgICAgICAgY29uc29sZS53YXJuKGBGYWlsZWQgdG8gcGFyc2Ugc2Vzc2lvbiBmcm9tIFVSTCBwYXJhbWV0ZXI6ICR7c2Vzc2lvbn1gKTtcbiAgICAgICAgICAgIHJldHVybiB1bmRlZmluZWQ7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKHNlc3Npb24uYWRkcmVzcy5oYXNoICE9PSBhZGRyZXNzLmhhc2gpIHtcbiAgICAgICAgICAgIGNvbnNvbGUud2FybihgU2Vzc2lvbiBhZGRyZXNzIGhhc2ggZG9lcyBub3QgbWF0Y2g6IGV4cGVjdGVkICR7YWRkcmVzcy5oYXNofSwgZ290ICR7c2Vzc2lvbi5hZGRyZXNzLmhhc2h9YCk7XG4gICAgICAgICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBzZXNzaW9uLnRva2VuO1xuICAgIH1cbn1cbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBU08sU0FBUyxRQUFzQixDQUFDLE1BQStCO0FBQUEsRUFDbEUsSUFBSTtBQUFBLElBQ0EsT0FBTyxFQUFFLElBQUksTUFBTSxNQUFNLEtBQUssRUFBRTtBQUFBLElBQ2xDLE9BQU8sR0FBRztBQUFBLElBQ1IsT0FBTyxFQUFFLElBQUksT0FBTyxNQUFNLEVBQU87QUFBQTtBQUFBOzs7QUNDbEMsTUFBTSxxQkFBOEM7QUFBQSxTQUNoQyxrQkFBa0I7QUFBQSxFQUVqQyxNQUFNLENBQUMsU0FBa0IsS0FBa0I7QUFBQSxJQUMvQyxPQUFPLEtBQUssVUFBVSxDQUFDLFFBQVEsTUFBTSxRQUFRLE1BQU0sUUFBUSxRQUFRLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxDQUFDO0FBQUE7QUFBQSxPQUczRSxJQUFHLENBQUMsU0FBa0IsS0FBdUM7QUFBQSxJQUN0RSxNQUFNLGFBQWEsS0FBSyxrQkFBa0IsT0FBTztBQUFBLElBQ2pELElBQUk7QUFBQSxNQUFZLE9BQU87QUFBQSxJQUN2QjtBQUFBO0FBQUEsRUFHSSxpQkFBaUIsQ0FBQyxTQUFzQztBQUFBLElBQzVELE1BQU0sZUFBZSxJQUFJLGdCQUFnQixTQUFTLE1BQU07QUFBQSxJQUN4RCxNQUFNLFFBQVEsYUFBYSxJQUFJLHFCQUFxQixlQUFlO0FBQUEsSUFDbkUsSUFBSSxDQUFDO0FBQUEsTUFBTztBQUFBLElBQ1osUUFBUSxJQUFJLE1BQU0sWUFBWSxTQUF1QixNQUFNLEtBQUssTUFBTSxLQUFLLENBQUM7QUFBQSxJQUM1RSxJQUFJLENBQUMsSUFBSTtBQUFBLE1BQ0wsUUFBUSxLQUFLLCtDQUErQyxTQUFTO0FBQUEsTUFDckU7QUFBQSxJQUNKO0FBQUEsSUFDQSxJQUFJLFFBQVEsUUFBUSxTQUFTLFFBQVEsTUFBTTtBQUFBLE1BQ3ZDLFFBQVEsS0FBSyxpREFBaUQsUUFBUSxhQUFhLFFBQVEsUUFBUSxNQUFNO0FBQUEsTUFDekc7QUFBQSxJQUNKO0FBQUEsSUFDQSxPQUFPLFFBQVE7QUFBQTtBQUV2QjsiLAogICJkZWJ1Z0lkIjogIkQ4MEYzQUNDRDdCRUYwOEE2NDc1NkUyMTY0NzU2RTIxIiwKICAibmFtZXMiOiBbXQp9
+//# debugId=5F429A2ECACDD4F464756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL2hlbHBlci50cyIsICIuLi8uLi9zcmMvdG9rZW4udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAidHlwZSBPazxUPiA9IHtcbiAgICBvazogdHJ1ZTtcbiAgICBkYXRhOiBUO1xufTtcbnR5cGUgRXJyPEU+ID0ge1xuICAgIG9rOiBmYWxzZTtcbiAgICBkYXRhOiBFO1xufTtcblxuZXhwb3J0IGZ1bmN0aW9uIHRyeUNhdGNoPFQsIEUgPSBFcnJvcj4oZnVuYzogKCkgPT4gVCk6IE9rPFQ+IHwgRXJyPEU+IHtcbiAgICB0cnkge1xuICAgICAgICByZXR1cm4geyBvazogdHJ1ZSwgZGF0YTogZnVuYygpIH07XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgICByZXR1cm4geyBvazogZmFsc2UsIGRhdGE6IGUgYXMgRSB9O1xuICAgIH1cbn1cbiIsCiAgICAiaW1wb3J0IHR5cGUgeyBBZGRyZXNzIH0gZnJvbSAnLi9hZGRyZXNzLmpzJztcblxuaW1wb3J0IHR5cGUgeyBBcHAgfSBmcm9tICcuL2FwcC5qcyc7XG5pbXBvcnQgeyB0cnlDYXRjaCB9IGZyb20gJy4vaGVscGVyLmpzJztcblxuZXhwb3J0IGludGVyZmFjZSBTZXNzaW9Ub2tlblByb3ZpZGVyIHtcbiAgICBnZXQoc2VydmVyQWRkcmVzczogQWRkcmVzcywgYXBwOiBBcHApOiBQcm9taXNlPHN0cmluZyB8IHVuZGVmaW5lZD47XG59XG5cbmV4cG9ydCB0eXBlIFNlc3Npb25QYXJhbSA9IHtcbiAgICBhZGRyZXNzOiBBZGRyZXNzO1xuICAgIHRva2VuOiBzdHJpbmc7XG59O1xuXG5leHBvcnQgY2xhc3MgQnJvd3NlclNlc3Npb24gaW1wbGVtZW50cyBTZXNzaW9Ub2tlblByb3ZpZGVyIHtcbiAgICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IFBBUkFNX05BTUUgPSAnX29tdV9zZXNzaW9uJztcblxuICAgIHB1YmxpYyBhc3luYyBnZXQoYWRkcmVzczogQWRkcmVzcyk6IFByb21pc2U8c3RyaW5nIHwgdW5kZWZpbmVkPiB7XG4gICAgICAgIGNvbnN0IGZvdW5kVG9rZW4gPSB0aGlzLnBhcnNlUGFyYW1TZXNzaW9uKGFkZHJlc3MpO1xuICAgICAgICBpZiAoZm91bmRUb2tlbikgcmV0dXJuIGZvdW5kVG9rZW47XG4gICAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBwcml2YXRlIHBhcnNlUGFyYW1TZXNzaW9uKGFkZHJlc3M6IEFkZHJlc3MpOiBzdHJpbmcgfCB1bmRlZmluZWQge1xuICAgICAgICBjb25zdCBzZWFyY2hQYXJhbXMgPSBuZXcgVVJMU2VhcmNoUGFyYW1zKGxvY2F0aW9uLnNlYXJjaCk7XG4gICAgICAgIGNvbnN0IHBhcmFtID0gc2VhcmNoUGFyYW1zLmdldChCcm93c2VyU2Vzc2lvbi5QQVJBTV9OQU1FKTtcbiAgICAgICAgaWYgKCFwYXJhbSkgcmV0dXJuO1xuICAgICAgICBjb25zdCB7IG9rLCBkYXRhOiBzZXNzaW9uIH0gPSB0cnlDYXRjaDxTZXNzaW9uUGFyYW0+KCgpID0+IEpTT04ucGFyc2UocGFyYW0pKTtcbiAgICAgICAgaWYgKCFvaykge1xuICAgICAgICAgICAgY29uc29sZS53YXJuKGBGYWlsZWQgdG8gcGFyc2Ugc2Vzc2lvbiBmcm9tIFVSTCBwYXJhbWV0ZXI6ICR7c2Vzc2lvbn1gKTtcbiAgICAgICAgICAgIHJldHVybiB1bmRlZmluZWQ7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKHNlc3Npb24uYWRkcmVzcy5oYXNoICE9PSBhZGRyZXNzLmhhc2gpIHtcbiAgICAgICAgICAgIGNvbnNvbGUud2FybihgU2Vzc2lvbiBhZGRyZXNzIGhhc2ggZG9lcyBub3QgbWF0Y2g6IGV4cGVjdGVkICR7YWRkcmVzcy5oYXNofSwgZ290ICR7c2Vzc2lvbi5hZGRyZXNzLmhhc2h9YCk7XG4gICAgICAgICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiBzZXNzaW9uLnRva2VuO1xuICAgIH1cbn1cbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBU08sU0FBUyxRQUFzQixDQUFDLE1BQStCO0FBQUEsRUFDbEUsSUFBSTtBQUFBLElBQ0EsT0FBTyxFQUFFLElBQUksTUFBTSxNQUFNLEtBQUssRUFBRTtBQUFBLElBQ2xDLE9BQU8sR0FBRztBQUFBLElBQ1IsT0FBTyxFQUFFLElBQUksT0FBTyxNQUFNLEVBQU87QUFBQTtBQUFBOzs7QUNDbEMsTUFBTSxlQUE4QztBQUFBLFNBQ2hDLGFBQWE7QUFBQSxPQUV2QixJQUFHLENBQUMsU0FBK0M7QUFBQSxJQUM1RCxNQUFNLGFBQWEsS0FBSyxrQkFBa0IsT0FBTztBQUFBLElBQ2pELElBQUk7QUFBQSxNQUFZLE9BQU87QUFBQSxJQUN2QjtBQUFBO0FBQUEsRUFHSSxpQkFBaUIsQ0FBQyxTQUFzQztBQUFBLElBQzVELE1BQU0sZUFBZSxJQUFJLGdCQUFnQixTQUFTLE1BQU07QUFBQSxJQUN4RCxNQUFNLFFBQVEsYUFBYSxJQUFJLGVBQWUsVUFBVTtBQUFBLElBQ3hELElBQUksQ0FBQztBQUFBLE1BQU87QUFBQSxJQUNaLFFBQVEsSUFBSSxNQUFNLFlBQVksU0FBdUIsTUFBTSxLQUFLLE1BQU0sS0FBSyxDQUFDO0FBQUEsSUFDNUUsSUFBSSxDQUFDLElBQUk7QUFBQSxNQUNMLFFBQVEsS0FBSywrQ0FBK0MsU0FBUztBQUFBLE1BQ3JFO0FBQUEsSUFDSjtBQUFBLElBQ0EsSUFBSSxRQUFRLFFBQVEsU0FBUyxRQUFRLE1BQU07QUFBQSxNQUN2QyxRQUFRLEtBQUssaURBQWlELFFBQVEsYUFBYSxRQUFRLFFBQVEsTUFBTTtBQUFBLE1BQ3pHO0FBQUEsSUFDSjtBQUFBLElBQ0EsT0FBTyxRQUFRO0FBQUE7QUFFdkI7IiwKICAiZGVidWdJZCI6ICI1RjQyOUEyRUNBQ0RENEY0NjQ3NTZFMjE2NDc1NkUyMSIsCiAgIm5hbWVzIjogW10KfQ==

package/dist/esm/version.js

@@ -1,11 +1,11 @@
 // @bun
 // src/version.ts
-var VERSION = "0.9.41";
+var VERSION = "0.9.43";
 var VERSION_MINOR = "0.9.0";
 export {
   VERSION_MINOR,
   VERSION
 };
 
-//# debugId=3ACA251B129C8C8164756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZlcnNpb24udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0IGNvbnN0IFZFUlNJT04gPSAnMC45LjQxJztcbmV4cG9ydCBjb25zdCBWRVJTSU9OX01JTk9SID0gJzAuOS4wJztcbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBQU8sSUFBTSxVQUFVO0FBQ2hCLElBQU0sZ0JBQWdCOyIsCiAgImRlYnVnSWQiOiAiM0FDQTI1MUIxMjlDOEM4MTY0NzU2RTIxNjQ3NTZFMjEiLAogICJuYW1lcyI6IFtdCn0=
+//# debugId=FF0725BD19B7DDEC64756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vc3JjL3ZlcnNpb24udHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiZXhwb3J0IGNvbnN0IFZFUlNJT04gPSAnMC45LjQzJztcbmV4cG9ydCBjb25zdCBWRVJTSU9OX01JTk9SID0gJzAuOS4wJztcbiIKICBdLAogICJtYXBwaW5ncyI6ICI7O0FBQU8sSUFBTSxVQUFVO0FBQ2hCLElBQU0sZ0JBQWdCOyIsCiAgImRlYnVnSWQiOiAiRkYwNzI1QkQxOUI3RERFQzY0NzU2RTIxNjQ3NTZFMjEiLAogICJuYW1lcyI6IFtdCn0=

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "@omujs/omu",
-    "version": "0.9.41",
+    "version": "0.9.43",
     "main": "./dist/esm/index.js",
     "types": "./dist/dts/index.d.ts",
     "exports": {

package/src/api/asset/extension.ts

@@ -10,14 +10,14 @@ export const ASSET_EXTENSION_TYPE: ExtensionType<AssetExtension> = new Extension
 );
 
 export type Asset = {
-    identifier: Identifier;
+    id: Identifier;
     buffer: Uint8Array;
 };
 
 const FILE_SERIALIZER = new Serializer<Asset, Uint8Array>(
     (file) => {
         const writer = new ByteWriter();
-        writer.writeString(file.identifier.key());
+        writer.writeString(file.id.key());
         writer.writeUint8Array(file.buffer);
         return writer.finish();
     },
@@ -26,7 +26,7 @@ const FILE_SERIALIZER = new Serializer<Asset, Uint8Array>(
         const identifier = Identifier.fromKey(reader.readString());
         const buffer = reader.readUint8Array();
         reader.finish();
-        return { identifier, buffer };
+        return { id: identifier, buffer };
     },
 );
 const FILE_ARRAY_SERIALIZER = new Serializer<Asset[], Uint8Array>(
@@ -34,7 +34,7 @@ const FILE_ARRAY_SERIALIZER = new Serializer<Asset[], Uint8Array>(
         const writer = new ByteWriter();
         writer.writeULEB128(files.length);
         for (const file of files) {
-            writer.writeString(file.identifier.key());
+            writer.writeString(file.id.key());
             writer.writeUint8Array(file.buffer);
         }
         return writer.finish();
@@ -46,7 +46,7 @@ const FILE_ARRAY_SERIALIZER = new Serializer<Asset[], Uint8Array>(
         for (let i = 0; i < length; i++) {
             const identifier = Identifier.fromKey(reader.readString());
             const buffer = reader.readUint8Array();
-            files.push({ identifier, buffer });
+            files.push({ id: identifier, buffer });
         }
         reader.finish();
         return files;
@@ -125,7 +125,7 @@ export class AssetExtension {
 
     public async upload(identifier: IntoId, buffer: Uint8Array): Promise<Identifier> {
         const assetIdentifier = await this.omu.endpoints.call(ASSET_UPLOAD_ENDPOINT, {
-            identifier: Identifier.from(identifier),
+            id: Identifier.from(identifier),
             buffer,
         });
         return assetIdentifier;

package/src/api/dashboard/extension.ts

@@ -2,8 +2,10 @@ import { App, AppJson } from '../../app.js';
 import { Identifier, IdentifierMap } from '../../identifier';
 import { PacketType } from '../../network/packet/packet.js';
 import { Omu } from '../../omu.js';
+import { PromiseResult } from '../../result.js';
 import { Serializer } from '../../serialize';
 import { EndpointType } from '../endpoint/endpoint.js';
+import { InvokedParams } from '../endpoint/packets.js';
 import { ExtensionType } from '../extension.js';
 import { PermissionTypeJson } from '../permission/permission.js';
 import { PackageInfo } from '../plugin/package-info.js';
@@ -94,11 +96,11 @@ export type Cookie = {
 
 export type WebviewRequest = {
     url: string;
-    script: string;
+    script?: string;
 };
 
 export type WebviewPacket = {
-    id: Identifier;
+    id: string;
 };
 
 export type UserResponse<T = undefined> = {
@@ -109,25 +111,10 @@ export type UserResponse<T = undefined> = {
 } | {
     type: 'cancelled';
 };
-export class UserResult<T> {
-    constructor(
-        public result: {
-            type: 'ok';
-            value: T;
-        } | {
-            type: 'blocked';
-        } | {
-            type: 'cancelled';
-        },
-    ) {}
-
-    public unwrap(): T {
-        if (this.result.type === 'ok') return this.result.value;
-        throw new Error(`Tried to unwrap a ${this.result.type} result`);
-    }
-}
 
-export type WebviewResponse = UserResponse & WebviewPacket;
+export type UserError = Exclude<UserResponse, { type: 'ok' }>;
+
+export type WebviewResponse = UserResponse<WebviewPacket>;
 
 export const DASHBOARD_WEBVIEW_PERMISSION_ID: Identifier = DASHBOARD_EXTENSION_TYPE.join('webview');
 
@@ -146,17 +133,11 @@ const DASHBOARD_COOKIES_GET = EndpointType.createJson<GetCookiesRequest, UserRes
 
 const DASHBOARD_WEBVIEW_REQUEST = EndpointType.createJson<WebviewRequest, WebviewResponse>(DASHBOARD_EXTENSION_TYPE, {
     name: 'webview_request',
-    responseSerializer: Serializer.noop<WebviewResponse>()
-        .field('id', Identifier),
     permissionId: DASHBOARD_WEBVIEW_PERMISSION_ID,
 });
 
 const DASHBOARD_WEBVIEW_CLOSE = EndpointType.createJson<WebviewPacket, WebviewResponse>(DASHBOARD_EXTENSION_TYPE, {
     name: 'webview_close',
-    requestSerializer: Serializer.noop<WebviewPacket>()
-        .field('id', Identifier),
-    responseSerializer: Serializer.noop<WebviewResponse>()
-        .field('id', Identifier),
     permissionId: DASHBOARD_WEBVIEW_PERMISSION_ID,
 });
 
@@ -186,9 +167,9 @@ export type WebviewEventPacket = {
 export type WebviewHandle = {
     readonly id: Identifier;
     readonly url: string;
-    getCookies(): Promise<Cookie[]>;
-    close(): void;
+    getCookies(): PromiseResult<Cookie[], UserError>;
     on<T extends WebviewEvent['type']>(key: T, callback: (event: Extract<WebviewEvent, { type: T }>) => void): void;
+    close(): Promise<void>;
     join(): Promise<void>;
 };
 
@@ -462,38 +443,46 @@ export class DashboardExtension {
             throw new Error('Dashboard already set');
         }
         this.dashboard = dashboard;
-        this.omu.endpoints.bind(DASHBOARD_COOKIES_GET, async (request, params): Promise<UserResponse<Cookie[]>> => {
-            const { url } = request;
-            const { hostname } = new URL(url);
+
+        const requireHost = async (params: InvokedParams, host: string): Promise<UserResponse<undefined>> => {
             const id = params.caller.key();
-            const allowedHost: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
-            const allowed = allowedHost.hosts.includes(hostname);
+            const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id: id, hosts: [] };
+            const allowed = hostEntry.hosts.includes(host);
             if (!allowed) {
-                return {
-                    type: 'cancelled',
-                };
+                const result = await dashboard.hostRequested({
+                    host,
+                }, params);
+                if (result.type === 'ok') {
+                    hostEntry.hosts.push(host);
+                    await this.allowedHosts.update(hostEntry);
+                } else {
+                    return { type: 'cancelled' };
+                }
+            }
+            return { type: 'ok', value: undefined };
+        };
+
+        this.omu.endpoints.bind(DASHBOARD_COOKIES_GET, async (request, params): Promise<UserResponse<Cookie[]>> => {
+            const { url } = request;
+            const { host } = new URL(url);
+            const hostAccessResult = await requireHost(params, host);
+            if (hostAccessResult.type !== 'ok') {
+                return hostAccessResult;
             }
             return await dashboard.getCookies(request);
         });
         this.omu.endpoints.bind(DASHBOARD_HOST_REQUEST, async (request, params): Promise<UserResponse> => {
             const { host } = request;
-            const id = params.caller.key();
-            const hostEntry: AllowedHost = await this.allowedHosts.get(id) ?? { id, hosts: [] };
-            const allowed = hostEntry.hosts.includes(host);
-            if (allowed) {
-                return {
-                    type: 'ok',
-                    value: undefined,
-                };
-            }
-            const result = await dashboard.hostRequested(request, params);
-            if (result.type === 'ok') {
-                hostEntry.hosts.push(host);
-                await this.allowedHosts.update(hostEntry);
-            }
+            const result = await requireHost(params, host);
             return result;
         });
         this.omu.endpoints.bind(DASHBOARD_WEBVIEW_REQUEST, async (request, params): Promise<WebviewResponse> => {
+            const url = new URL(request.url);
+            const { host } = url;
+            const hostAccessResult = await requireHost(params, host);
+            if (hostAccessResult.type !== 'ok') {
+                return hostAccessResult;
+            }
             const emit = async (event: WebviewEvent) => {
                 this.omu.send(DASHBOARD_WEBVIEW_EVENT_PACKET, {
                     id,
@@ -504,8 +493,9 @@ export class DashboardExtension {
             const id = await dashboard.createWebview(request, params, emit);
             return {
                 type: 'ok',
-                id,
-                value: undefined,
+                value: {
+                    id: id.key(),
+                },
             };
         });
         this.omu.endpoints.bind(DASHBOARD_WEBVIEW_CLOSE, async (request, params): Promise<WebviewResponse> => {
@@ -513,14 +503,14 @@ export class DashboardExtension {
             if (!id) {
                 return {
                     type: 'cancelled',
-                    id: request.id,
                 };
             }
             await dashboard.closeWebview(request, params);
             return {
                 type: 'ok',
-                id,
-                value: undefined,
+                value: {
+                    id: id.key(),
+                },
             };
         });
         this.omu.endpoints.bind(DASHBOARD_SPEECH_RECOGNITION_START, async (request, params): Promise<UserResponse<undefined>> => {
@@ -538,70 +528,74 @@ export class DashboardExtension {
         });
     }
 
-    public async requestHost(options: { host: string }): Promise<UserResponse> {
-        return this.omu.endpoints.call(
-            DASHBOARD_HOST_REQUEST,
-            options,
-        );
-    }
-
-    public async requestWebview(options: WebviewRequest): Promise<UserResult<WebviewHandle>> {
-        const result = await this.omu.endpoints.call(
+    public requestWebview(options: WebviewRequest): PromiseResult<WebviewHandle, UserError> {
+        const { promise, resolve, reject } = PromiseResult.create<WebviewHandle, UserError>();
+        this.omu.endpoints.call(
             DASHBOARD_WEBVIEW_REQUEST,
             options,
-        );
-        if (result.type !== 'ok') return new UserResult(result);
-        const { id } = result;
-        const eventListeners: WebviewEventListeners = {};
-        const handle: WebviewHandle = {
-            id,
-            url: options.url,
-            close: async () => {
-                await this.omu.endpoints.call(
-                    DASHBOARD_WEBVIEW_CLOSE,
-                    { id },
-                );
-            },
-            getCookies: async () => {
-                const cookies = (await this.getCookies({
+        ).then((result) => {
+            if (result.type !== 'ok') {
+                reject(result);
+                return;
+            }
+            const { value } = result;
+            const id = Identifier.fromKey(value.id);
+            const eventListeners: WebviewEventListeners = {};
+            const handle: WebviewHandle = {
+                id,
+                url: options.url,
+                close: async () => {
+                    await this.omu.endpoints.call(
+                        DASHBOARD_WEBVIEW_CLOSE,
+                        { id: id.key() },
+                    );
+                },
+                getCookies: () => this.getCookies({
                     url: options.url,
-                })).unwrap();
-                return cookies;
-            },
-            on: function <T extends WebviewEvent['type']>(key: T, callback: (event: Extract<WebviewEvent, { type: T }>) => void): void {
-                if (!eventListeners[key]) {
-                    eventListeners[key] = [];
-                }
-                const listeners = eventListeners[key]!;
-                listeners.push(callback);
-            },
-            join: async () => {
-                await new Promise<void>((resolve) => {
-                    handle.on('closed', () => resolve());
-                });
-            },
-        };
-        this.webviewHandles.set(id, {
-            handle,
-            emit: function <T extends WebviewEvent['type']>(event: Extract<WebviewEvent, { type: T }>): void {
-                const listeners = eventListeners[event.type];
-                if (!listeners) return;
-                for (const listener of listeners) {
-                    listener(event);
-                }
-            },
-        });
-        return new UserResult({
-            type: 'ok',
-            value: handle,
+                }),
+                on: function <T extends WebviewEvent['type']>(key: T, callback: (event: Extract<WebviewEvent, { type: T }>) => void): void {
+                    if (!eventListeners[key]) {
+                        eventListeners[key] = [];
+                    }
+                    const listeners = eventListeners[key]!;
+                    listeners.push(callback);
+                },
+                join: async () => {
+                    await new Promise<void>((resolve) => {
+                        handle.on('closed', () => resolve());
+                    });
+                },
+            };
+            this.webviewHandles.set(id, {
+                handle,
+                emit: function <T extends WebviewEvent['type']>(event: Extract<WebviewEvent, { type: T }>): void {
+                    const listeners = eventListeners[event.type];
+                    if (!listeners) return;
+                    for (const listener of listeners) {
+                        listener(event);
+                    }
+                },
+            });
+
+            resolve(handle);
         });
+        return promise;
     }
 
-    public async getCookies(options: GetCookiesRequest): Promise<UserResult<Cookie[]>> {
-        return new UserResult(await this.omu.endpoints.call(
+    public getCookies(options: GetCookiesRequest): PromiseResult<Cookie[], UserError> {
+        const { promise, resolve, reject } = PromiseResult.create<Cookie[], UserError>();
+        this.omu.endpoints.call(
             DASHBOARD_COOKIES_GET,
             options,
-        ));
+        ).then((response) => {
+            if (response.type === 'ok') {
+                resolve(response.value);
+                return;
+            } else {
+                reject(response);
+            }
+        });
+        return promise;
     }
 
     public async openApp(app: App): Promise<void> {
@@ -616,7 +610,7 @@ export class DashboardExtension {
         return await this.omu.endpoints.call(DASHBOARD_PROMPT_CLEAR_BLOCKED, null);
     }
 
-    public async requireDragDrop(): Promise<DragDropHandler> {
+    public async requestDragDrop(): Promise<DragDropHandler> {
         await this.omu.endpoints.call(DASHBOARD_DRAG_DROP_REQUEST_ENDPOINT, {});
         const listeners = this.dragDropListeners;
         const client = this.omu;
@@ -634,7 +628,15 @@ export class DashboardExtension {
         this.omu.send(DASHBOARD_DRAG_DROP_STATE_PACKET, packet);
     }
 
-    public async speechRecognitionStart(): Promise<void> {
-        await this.omu.endpoints.call(DASHBOARD_SPEECH_RECOGNITION_START, { type: 'start' });
+    public requestSpeechRecognition(): PromiseResult<Registry<TranscriptStatus>, UserError> {
+        const { promise, resolve, reject } = PromiseResult.create<Registry<TranscriptStatus>, UserError>();
+        this.omu.endpoints.call(DASHBOARD_SPEECH_RECOGNITION_START, { type: 'start' }).then((result) => {
+            if (result.type === 'ok') {
+                resolve(this.speechRecognition);
+            } else {
+                reject(result);
+            }
+        });
+        return promise;
     }
 }

package/src/api/http/index.ts

@@ -1,2 +1,3 @@
-export { HTTP_REQUEST_PERMISSION_ID, OmuWS, type WSMsg } from './extension';
+export { HTTP_REQUEST_PERMISSION_ID } from './extension';
+export { OmuWS, type WSMsg } from './websocket';
 

package/src/api/registry/extension.ts

@@ -121,12 +121,12 @@ class RegistryImpl<T> implements Registry<T> {
         return value;
     }
 
-    public async modify(fn: (value: T) => PromiseLike<T> | T): Promise<T> {
+    public async modify(fn: (value: T) => PromiseLike<void> | void): Promise<T> {
         const value = await this.lock.use(async () => {
             const value = await this.#get();
-            const newValue = await fn(value);
-            await this.#set(newValue);
-            return newValue;
+            await fn(value);
+            await this.#set(value);
+            return value;
         });
         this.eventEmitter.emit(value);
         return value;

package/src/api/registry/registry.ts

@@ -68,7 +68,7 @@ export interface Registry<T> {
     get(): Promise<T>;
     set(value: T): Promise<void>;
     update(fn: (value: T) => PromiseLike<T> | T): Promise<T>;
-    modify(fn: (value: T) => PromiseLike<T> | T): Promise<T>;
+    modify(fn: (value: T) => PromiseLike<void> | void): Promise<T>;
     listen(fn: (value: T) => void): Unlisten;
 
     compatSvelte(): Writable<T>;

package/src/api/session/extension.ts

@@ -3,6 +3,7 @@ import { Identifier, IdentifierMap, IdentifierSet, IntoId } from '../../identifi
 import { PacketType } from '../../network/packet';
 import { Omu } from '../../omu';
 import { Serializer } from '../../serialize';
+import { SessionParam } from '../../token';
 import { EndpointType } from '../endpoint';
 import { Extension, ExtensionType } from '../extension';
 import { SessionObserver } from '../server/extension';
@@ -105,20 +106,21 @@ export class SessionExtension implements Extension {
         return await this.sessions.has(Identifier.from(id).key());
     }
 
-    public observe(appId: IntoId, {
-        onConnect,
-        onDisconnect,
-    }: {
-        onConnect(app: App): void;
-        onDisconnect(app: App): void;
+    public observe(appId: IntoId, options?: {
+        onConnect?(app: App): void;
+        onDisconnect?(app: App): void;
     }): SessionObserver {
         const id = Identifier.from(appId);
         if (this.omu.running) {
             this.omu.send(SESSION_OBSERVE_PACKET_TYPE, [id]);
         }
         const observer = this.sessionObservers.get(id) ?? new SessionObserver([], []);
-        observer.onConnect(onConnect);
-        observer.onDisconnect(onDisconnect);
+        if (options?.onConnect) {
+            observer.onConnect(options.onConnect);
+        }
+        if (options?.onDisconnect) {
+            observer.onDisconnect(options.onDisconnect);
+        }
         this.sessionObservers.set(id, observer);
         return observer;
     }
@@ -187,7 +189,7 @@ export class SessionExtension implements Extension {
     public async generateToken(options: {
         app: App;
         permissions?: IntoId[];
-    }): Promise<string> {
+    }): Promise<SessionParam> {
         const result = await this.omu.endpoints.call(GENERATE_TOKEN_ENDPOINT_TYPE, {
             app: App.serialize(options.app),
             permissions: options.permissions?.map(id => Identifier.from(id).key()),
@@ -195,6 +197,9 @@ export class SessionExtension implements Extension {
         if (result.type === 'error') {
             throw new Error(result.message);
         }
-        return result.token;
+        return {
+            token: result.token,
+            address: this.omu.address,
+        };
     }
 }

package/src/index.ts

@@ -6,7 +6,7 @@ export * as network from './network';
 export { Omu } from './omu.js';
 export { Serializer } from './serialize';
 export type { Serializable } from './serialize';
-export { BrowserTokenProvider, type SessionParam, type TokenProvider } from './token';
+export { BrowserSession, type SessionParam, type SessioTokenProvider as TokenProvider } from './token';
 import { ASSET_PERMISSION_ID } from './api/asset';
 import {
     DASHBOARD_APP_INSTALL_PERMISSION_ID,