@cripty2001/utils 0.0.62 → 0.0.64

package/dist/Appserver/client.d.ts

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

package/dist/Appserver/client.js

@@ -1,6 +1,7 @@
 "use strict";
 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");
 class ClientError extends Error {
     constructor(message) {
@@ -28,12 +29,18 @@ class ClientValidationError extends ClientError {
 exports.ClientValidationError = ClientValidationError;
 class Client {
     url;
+    authToken;
+    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);
+    }
+    static create(url) {
+        return new Client(url);
     }
-    authToken = null;
     setAuthToken(token) {
-        this.authToken = token;
+        this.setAuthToken(token ?? null);
     }
     async exec(action, input) {
         const res = await fetch(`${this.url}/exec/${action}`, {
@@ -49,7 +56,7 @@ class Client {
         switch (res.status) {
             case 401:
             case 403:
-                this.authToken = null;
+                this.setAuthToken(null);
                 throw new ClientError("Permission denied");
             case 200:
                 responseData = decoded;

package/dist/Appserver/server.d.ts

@@ -1,7 +1,7 @@
 import { Static, TSchema } from '@sinclair/typebox';
 import { AppserverData } from './common';
 export type { AppserverData };
-export { Type, Static, TSchema } from '@sinclair/typebox';
+export { Static, TSchema, Type } from '@sinclair/typebox';
 export { Value } from '@sinclair/typebox/value';
 export type AppserverHandler<I extends AppserverData, U extends AppserverData, O extends AppserverData> = (input: I, user: U | null) => Promise<O> | O;
 export type AppserverUsergetter<U extends AppserverData> = (token: string) => Promise<U | null>;
@@ -38,6 +38,7 @@ export declare class Appserver<U extends AppserverData> {
     private getMetrics;
     private registered;
     constructor(port: number, parseUser: AppserverUsergetter<U>, getMetrics: () => Record<string, number>);
+    private registerAuth;
     private handleMetricsRequest;
     private parseInput;
     /**
@@ -48,4 +49,5 @@ export declare class Appserver<U extends AppserverData> {
      * @param handler business logic returning serializable data
      */
     register<ISchema extends TSchema, O extends AppserverData, I extends Static<ISchema> & AppserverData = Static<ISchema> & AppserverData>(action: string, inputSchema: ISchema, auth: boolean, handler: AppserverHandler<I, U, O>): void;
+    private unsafeRegister;
 }

package/dist/Appserver/server.js

@@ -4,12 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Appserver = exports.AppserverHandledError = exports.AppserverAuthError = exports.Value = exports.Type = void 0;
-const express_1 = __importDefault(require("express"));
-const value_1 = require("@sinclair/typebox/value");
 const msgpack_1 = require("@msgpack/msgpack");
+const typebox_1 = require("@sinclair/typebox");
+const value_1 = require("@sinclair/typebox/value");
+const express_1 = __importDefault(require("express"));
 // Helpful for avoiding sinclair version mismatch between this and the actual user of the package
-var typebox_1 = require("@sinclair/typebox");
-Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return typebox_1.Type; } });
+var typebox_2 = require("@sinclair/typebox");
+Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return typebox_2.Type; } });
 var value_2 = require("@sinclair/typebox/value");
 Object.defineProperty(exports, "Value", { enumerable: true, get: function () { return value_2.Value; } });
 (0, msgpack_1.encode)({}); // Fixes issue with msgpack not being included in build
@@ -64,6 +65,15 @@ class Appserver {
         this.app.get('/metrics', async (req, res) => {
             await this.handleMetricsRequest(req, res);
         });
+        this.registerAuth(this.app);
+    }
+    registerAuth(app) {
+        this.unsafeRegister('/auth/whoami', typebox_1.Type.Object({}), false, async (input, user) => {
+            return {
+                user: Object.fromEntries(Object.entries(user ?? {})
+                    .filter(([key]) => !key.startsWith('_')))
+            };
+        });
     }
     async handleMetricsRequest(req, res) {
         try {
@@ -119,10 +129,13 @@ class Appserver {
      * @param handler business logic returning serializable data
      */
     register(action, inputSchema, auth, handler) {
+        this.unsafeRegister(`/exec/${action}`, inputSchema, auth, handler);
+    }
+    unsafeRegister(action, inputSchema, auth, handler) {
         if (this.registered.has(action))
             throw new Error(`Action ${action} is already registered`);
         this.registered.add(action);
-        this.app.post(`/exec/${action}`, express_1.default.raw({ type: 'application/vnd.msgpack' }), async (req, res) => {
+        this.app.post(action, express_1.default.raw({ type: 'application/vnd.msgpack' }), async (req, res) => {
             const { status, data } = await (async () => {
                 try {
                     const { data: unsafeData, user } = await this.parseInput(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cripty2001/utils",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "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": {