@cripty2001/utils 0.0.65 → 0.0.67

package/dist/Appserver/client.d.ts

@@ -1,4 +1,5 @@
-import { Whispr } from "@cripty2001/whispr";
+import { WhisprSetter } from "@cripty2001/whispr";
+import { Dispatcher } from "../Dispatcher";
 import { AppserverData } from "./common";
 export type { AppserverData };
 export declare class ClientError extends Error {
@@ -16,9 +17,10 @@ export declare class ClientValidationError extends ClientError {
 export declare class Client {
     private url;
     private authToken;
-    loggedIn: Whispr<boolean>;
+    setAuthToken: WhisprSetter<string | null>;
+    loggedIn: Dispatcher<string | null, boolean>;
     private constructor();
     static create(url: string): Client;
-    setAuthToken(token: string | null): void;
     exec<I extends AppserverData, O extends AppserverData>(action: string, input: I): Promise<O>;
+    private unsafeExec;
 }

package/dist/Appserver/client.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = exports.ClientValidationError = exports.ClientServerError = exports.ClientError = void 0;
 const whispr_1 = require("@cripty2001/whispr");
 const msgpack_1 = require("@msgpack/msgpack");
+const Dispatcher_1 = require("../Dispatcher");
 class ClientError extends Error {
     constructor(message) {
         super(message);
@@ -30,20 +31,26 @@ exports.ClientValidationError = ClientValidationError;
 class Client {
     url;
     authToken;
+    setAuthToken;
     loggedIn;
     constructor(url) {
         this.url = url;
         [this.authToken, this.setAuthToken] = whispr_1.Whispr.create(null);
-        this.loggedIn = whispr_1.Whispr.from({ authToken: this.authToken }, ({ authToken }) => authToken !== null);
+        this.loggedIn = new Dispatcher_1.Dispatcher(this.authToken, async (token) => {
+            if (token === null)
+                return false;
+            const { user } = await this.unsafeExec('auth/whoami', {});
+            return user !== null;
+        }, 200);
     }
     static create(url) {
         return new Client(url);
     }
-    setAuthToken(token) {
-        this.setAuthToken(token ?? null);
-    }
     async exec(action, input) {
-        const res = await fetch(`${this.url}/exec/${action}`, {
+        return this.unsafeExec(`/exec/${action}`, input);
+    }
+    async unsafeExec(action, input) {
+        const res = await fetch(`${this.url}${action}`, {
             method: "POST",
             headers: {
                 "Content-Type": "application/vnd.msgpack",

package/dist/Appserver/server.js

@@ -69,9 +69,10 @@ class Appserver {
     }
     registerAuth(app) {
         this.unsafeRegister('/auth/whoami', typebox_1.Type.Object({}), false, async (input, user) => {
+            const mappedUser = Object.fromEntries(Object.entries(user ?? {})
+                .filter(([key]) => !key.startsWith('_')));
             return {
-                user: Object.fromEntries(Object.entries(user ?? {})
-                    .filter(([key]) => !key.startsWith('_')))
+                user: user !== null ? mappedUser : null
             };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cripty2001/utils",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "description": "Internal Set of utils. If you need them use them, otherwise go to the next package ;)",
   "homepage": "https://github.com/cripty2001/utils#readme",
   "bugs": {