@synonymdev/pubky 0.4.0-rc3 → 0.4.0

package/README.md

@@ -103,11 +103,13 @@ await client.signout(publicKey)
 
 #### authRequest
 ```js
-let [pubkyauthUrl, sessionPromise] = client.authRequest(relay, capabilities);
+let pubkyAuthRequest = client.authRequest(relay, capabilities);
+
+let pubkyauthUrl= pubkyAuthRequest.url();
 
 showQr(pubkyauthUrl);
 
-let pubky = await sessionPromise;
+let pubky = await pubkyAuthRequest.response();
 ```
 
 Sign in to a user's Homeserver, without access to their [Keypair](#keypair), nor even [PublicKey](#publickey),
@@ -116,10 +118,6 @@ instead request permissions (showing the user pubkyauthUrl), and await a Session
 - relay: A URL to an [HTTP relay](https://httprelay.io/features/link/) endpoint.
 - capabilities: A list of capabilities required for the app for example `/pub/pubky.app/:rw,/pub/example.com/:r`.
 
-Returns: 
-- pubkyauthUrl: A url to show to the user to scan or paste into an Authenticator app holding the user [Keypair](#keypair)
-- sessionPromise: A promise that resolves into a [PublicKey](#publickey) on success, which you can use in `client.session(pubky)` to resolve more information about the Session.
-
 #### sendAuthToken
 ```js
 await client.sendAuthToken(keypair, pubkyauthUrl);

package/index.cjs

@@ -52,6 +52,11 @@ function handleError(f, args) {
     }
 }
 
+function getArrayU8FromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
+}
+
 function dropObject(idx) {
     if (idx < 132) return;
     heap[idx] = heap_next;
@@ -228,6 +233,16 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
+
+function getArrayJsValueFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    const mem = getDataViewMemory0();
+    const result = [];
+    for (let i = ptr; i < ptr + 4 * len; i += 4) {
+        result.push(takeObject(mem.getUint32(i, true)));
+    }
+    return result;
+}
 /**
  * @param {string} level
  */
@@ -260,22 +275,11 @@ function _assertClass(instance, klass) {
  * @returns {Uint8Array}
  */
 module.exports.createRecoveryFile = function(keypair, passphrase) {
-    try {
-        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        _assertClass(keypair, Keypair);
-        const ptr0 = passStringToWasm0(passphrase, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.createRecoveryFile(retptr, keypair.__wbg_ptr, ptr0, len0);
-        var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-        var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-        if (r2) {
-            throw takeObject(r1);
-        }
-        return takeObject(r0);
-    } finally {
-        wasm.__wbindgen_add_to_stack_pointer(16);
-    }
+    _assertClass(keypair, Keypair);
+    const ptr0 = passStringToWasm0(passphrase, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.createRecoveryFile(keypair.__wbg_ptr, ptr0, len0);
+    return takeObject(ret);
 };
 
 function passArray8ToWasm0(arg, malloc) {
@@ -311,33 +315,85 @@ module.exports.decryptRecoveryFile = function(recovery_file, passphrase) {
     }
 };
 
-function getArrayJsValueFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    const mem = getDataViewMemory0();
-    const result = [];
-    for (let i = ptr; i < ptr + 4 * len; i += 4) {
-        result.push(takeObject(mem.getUint32(i, true)));
-    }
-    return result;
-}
 function __wbg_adapter_28(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3377896d609abf0a(arg0, arg1, addHeapObject(arg2));
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h39e5fd1911bc8420(arg0, arg1, addHeapObject(arg2));
 }
 
-function __wbg_adapter_153(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen__convert__closures__invoke2_mut__h53c3869863f2beff(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wbg_adapter_155(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__h93832735ab1a1a6b(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 const __wbindgen_enum_RequestCredentials = ["omit", "same-origin", "include"];
 
 const __wbindgen_enum_RequestMode = ["same-origin", "no-cors", "cors", "navigate"];
 
+const AuthRequestFinalization = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(ptr => wasm.__wbg_authrequest_free(ptr >>> 0, 1));
+
+class AuthRequest {
+
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(AuthRequest.prototype);
+        obj.__wbg_ptr = ptr;
+        AuthRequestFinalization.register(obj, obj.__wbg_ptr, obj);
+        return obj;
+    }
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        AuthRequestFinalization.unregister(this);
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_authrequest_free(ptr, 0);
+    }
+    /**
+     * Returns the Pubky Auth url, which you should show to the user
+     * to request an authentication or authorization token.
+     *
+     * Wait for this token using `this.response()`.
+     * @returns {string}
+     */
+    url() {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+            wasm.authrequest_url(retptr, this.__wbg_ptr);
+            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
+            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            deferred1_0 = r0;
+            deferred1_1 = r1;
+            return getStringFromWasm0(r0, r1);
+        } finally {
+            wasm.__wbindgen_add_to_stack_pointer(16);
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
+    }
+    /**
+     * Wait for the user to send an authentication or authorization proof.
+     *
+     * If successful, you should expect an instance of [PublicKey]
+     *
+     * Otherwise it will throw an error.
+     * @returns {Promise<PublicKey>}
+     */
+    response() {
+        const ret = wasm.authrequest_response(this.__wbg_ptr);
+        return takeObject(ret);
+    }
+}
+module.exports.AuthRequest = AuthRequest;
+
 const ClientFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_client_free(ptr >>> 0, 1));
-/**
- * A client for Pubky homeserver API, as well as generic HTTP requests to Pubky urls.
- */
+
 class Client {
 
     static __wrap(ptr) {
@@ -379,6 +435,41 @@ class Client {
         const ret = wasm.client_testnet();
         return Client.__wrap(ret);
     }
+    /**
+     * @param {string} url
+     * @param {any | null} [request_init]
+     * @returns {Promise<Promise<any>>}
+     */
+    fetch(url, request_init) {
+        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.client_fetch(this.__wbg_ptr, ptr0, len0, isLikeNone(request_init) ? 0 : addHeapObject(request_init));
+        return takeObject(ret);
+    }
+    /**
+     * Returns a list of Pubky urls (as strings).
+     *
+     * - `url`:     The Pubky url (string) to the directory you want to list its content.
+     * - `cursor`:  Either a full `pubky://` Url (from previous list response),
+     *                 or a path (to a file or directory) relative to the `url`
+     * - `reverse`: List in reverse order
+     * - `limit`    Limit the number of urls in the response
+     * - `shallow`: List directories and files, instead of flat list of files.
+     * @param {string} url
+     * @param {string | null} [cursor]
+     * @param {boolean | null} [reverse]
+     * @param {number | null} [limit]
+     * @param {boolean | null} [shallow]
+     * @returns {Promise<Array<any>>}
+     */
+    list(url, cursor, reverse, limit, shallow) {
+        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        var ptr1 = isLikeNone(cursor) ? 0 : passStringToWasm0(cursor, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len1 = WASM_VECTOR_LEN;
+        const ret = wasm.client_list(this.__wbg_ptr, ptr0, len0, ptr1, len1, isLikeNone(reverse) ? 0xFFFFFF : reverse ? 1 : 0, isLikeNone(limit) ? 0xFFFFFF : limit, isLikeNone(shallow) ? 0xFFFFFF : shallow ? 1 : 0);
+        return takeObject(ret);
+    }
     /**
      * Signup to a homeserver and update Pkarr accordingly.
      *
@@ -395,10 +486,10 @@ class Client {
         return takeObject(ret);
     }
     /**
-     * Check the current sesison for a given Pubky in its homeserver.
+     * Check the current session for a given Pubky in its homeserver.
      *
-     * Returns [Session] or `None` (if recieved `404 NOT_FOUND`),
-     * or throws the recieved error if the response has any other `>=400` status code.
+     * Returns [Session] or `None` (if received `404 NOT_FOUND`),
+     * or throws the received error if the response has any other `>=400` status code.
      * @param {PublicKey} pubky
      * @returns {Promise<Session | undefined>}
      */
@@ -432,10 +523,10 @@ class Client {
      * verifying that AuthToken, and if capabilities were requested, signing in to
      * the Pubky's homeserver and returning the [Session] information.
      *
-     * Returns a tuple of [pubkyAuthUrl, Promise<Session>]
+     * Returns a [AuthRequest]
      * @param {string} relay
      * @param {string} capabilities
-     * @returns {Array<any>}
+     * @returns {AuthRequest}
      */
     authRequest(relay, capabilities) {
         try {
@@ -451,7 +542,7 @@ class Client {
             if (r2) {
                 throw takeObject(r1);
             }
-            return takeObject(r0);
+            return AuthRequest.__wrap(r0);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -470,41 +561,6 @@ class Client {
         const ret = wasm.client_sendAuthToken(this.__wbg_ptr, keypair.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
-    /**
-     * Returns a list of Pubky urls (as strings).
-     *
-     * - `url`:     The Pubky url (string) to the directory you want to list its content.
-     * - `cursor`:  Either a full `pubky://` Url (from previous list response),
-     *                 or a path (to a file or directory) relative to the `url`
-     * - `reverse`: List in reverse order
-     * - `limit`    Limit the number of urls in the response
-     * - `shallow`: List directories and files, instead of flat list of files.
-     * @param {string} url
-     * @param {string | null} [cursor]
-     * @param {boolean | null} [reverse]
-     * @param {number | null} [limit]
-     * @param {boolean | null} [shallow]
-     * @returns {Promise<Array<any>>}
-     */
-    list(url, cursor, reverse, limit, shallow) {
-        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        var ptr1 = isLikeNone(cursor) ? 0 : passStringToWasm0(cursor, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len1 = WASM_VECTOR_LEN;
-        const ret = wasm.client_list(this.__wbg_ptr, ptr0, len0, ptr1, len1, isLikeNone(reverse) ? 0xFFFFFF : reverse ? 1 : 0, isLikeNone(limit) ? 0xFFFFFF : limit, isLikeNone(shallow) ? 0xFFFFFF : shallow ? 1 : 0);
-        return takeObject(ret);
-    }
-    /**
-     * @param {string} url
-     * @param {any | null} [request_init]
-     * @returns {Promise<Promise<any>>}
-     */
-    fetch(url, request_init) {
-        const ptr0 = passStringToWasm0(url, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.client_fetch(this.__wbg_ptr, ptr0, len0, isLikeNone(request_init) ? 0 : addHeapObject(request_init));
-        return takeObject(ret);
-    }
 }
 module.exports.Client = Client;
 
@@ -760,11 +816,6 @@ module.exports.__wbg_error_80de38b3f7cc3c3c = function(arg0, arg1, arg2, arg3) {
     console.error(getObject(arg0), getObject(arg1), getObject(arg2), getObject(arg3));
 };
 
-module.exports.__wbg_fetch_408fc9f7fddb9d4e = function(arg0) {
-    const ret = fetch(getObject(arg0));
-    return addHeapObject(ret);
-};
-
 module.exports.__wbg_fetch_4465c2b10f21a927 = function(arg0) {
     const ret = fetch(getObject(arg0));
     return addHeapObject(ret);
@@ -775,6 +826,15 @@ module.exports.__wbg_fetch_509096533071c657 = function(arg0, arg1) {
     return addHeapObject(ret);
 };
 
+module.exports.__wbg_fetch_dd5ce2b90da36779 = function(arg0) {
+    const ret = fetch(getObject(arg0));
+    return addHeapObject(ret);
+};
+
+module.exports.__wbg_getRandomValues_78e016fdd1d721cf = function() { return handleError(function (arg0, arg1) {
+    globalThis.crypto.getRandomValues(getArrayU8FromWasm0(arg0, arg1));
+}, arguments) };
+
 module.exports.__wbg_getRandomValues_bcb4912f16000dc4 = function() { return handleError(function (arg0, arg1) {
     getObject(arg0).getRandomValues(getObject(arg1));
 }, arguments) };
@@ -856,7 +916,7 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_153(a, state0.b, arg0, arg1);
+                return __wbg_adapter_155(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -1086,8 +1146,8 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper2728 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 534, __wbg_adapter_28);
+module.exports.__wbindgen_closure_wrapper2845 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 515, __wbg_adapter_28);
     return addHeapObject(ret);
 };