umami-api-js 0.0.3 → 0.1.0

package/README.md

@@ -1,5 +1,5 @@
-A package to interact with [the API of self-hosted instances of Umami v2.19.0](https://umami.is/docs/api). It is a lightweight alternative to [@umami/api-client](https://github.com/umami-software/api-client), forked from [osu-api-v2-js](https://github.com/TTTaevas/osu-api-v2-js).
+A package to interact with [the API of self-hosted instances of Umami v3.0.0](https://umami.is/docs/api). It is a lightweight alternative to [@umami/api-client](https://github.com/umami-software/api-client), forked from [osu-api-v2-js](https://github.com/TTTaevas/osu-api-v2-js).
 
-Please note that this package is not expected to work with Umami Cloud, the instance of Umami hosted by its creators.
+If you are reading this from the [package's documentation](https://umami-api-js.taevas.xyz/), please be aware that the documentation is for **umami-api-js@0.1.0**, so make sure your package is up to date! Report any bug on [Codeberg](https://codeberg.org/Taevas/umami-api-js/issues).
 
-Please also note that this is currently being built mainly to serve as a component to my [taevas.xyz](https://codeberg.org/Taevas/taevas.xyz) project, meaning it currently doesn't perfectly cover the API!
+Please note that this package is expected to work with self-hosted instances of **Umami v3.0.0**, and is *not* expected to work with [Umami Cloud](https://umami.is/docs/cloud), the instance of Umami hosted by its creators.

package/dist/index.d.ts

@@ -1,23 +1,56 @@
 import { Admin } from "./namespaces/Admin.js";
 import { Events } from "./namespaces/Events.js";
+import { Links } from "./namespaces/Links.js";
+import { Me } from "./namespaces/Me.js";
+import { Pixels } from "./namespaces/Pixels.js";
 import { Realtime } from "./namespaces/Realtime.js";
+import { Reports } from "./namespaces/Reports.js";
 import { Sessions } from "./namespaces/Sessions.js";
 import { Teams } from "./namespaces/Teams.js";
 import { Users } from "./namespaces/Users.js";
 import { Websites } from "./namespaces/Websites.js";
-export { Admin, Users, Teams, Events, Sessions, Websites, Realtime };
+import { WebsiteStats } from "./namespaces/WebsiteStats.js";
+export { Admin, Events, Links, Me, Pixels, Websites, WebsiteStats, Realtime, Reports, Sessions, Teams, Users };
 export interface ValueAndPrev {
     /** The actual value for the given time period */
     value: number;
     /** The value for the same *timespan* for the time period that ends where the time period for value starts  */
     prev: number;
 }
+export interface MinimalUser {
+    id: string;
+    username: string;
+}
 export interface GenericObject {
     id: string;
     createdAt: Date;
     updatedAt: Date | null;
     deletedAt: Date | null;
 }
+export interface Website extends GenericObject {
+    name: string;
+    domain: string;
+    shareId: string | null;
+    resetAt: Date | null;
+    userId: string;
+    teamId: string | null;
+    createdBy: string;
+}
+export interface Report extends Omit<GenericObject, "deletedAt"> {
+    userId: string;
+    websiteId: string;
+    type: string;
+    name: string;
+    description: string;
+    parameters: {
+        type: string;
+        value: string;
+    };
+}
+export interface NameValue {
+    name: string;
+    value: number;
+}
 export interface GenericRequestParameters {
     /** Search text */
     search?: string;
@@ -32,9 +65,17 @@ export interface Timestamps {
     /** Timestamp of end date */
     endAt: Date | number;
 }
+export interface XTY {
+    /** Event name */
+    x: string;
+    /** Timestamp */
+    t: Date;
+    /** Number of events */
+    y: number;
+}
 /**
  * Many endpoints can make use of the filters in this interface
- * @remarks As defined in the server documentation for the Endpoints in: Events, Sessions, Website stats
+ * @remarks As defined in the server documentation for the Endpoints in: Events, Sessions, Website stats, Reports
  */
 export interface Filters {
     /** Name of URL */
@@ -131,14 +172,14 @@ export declare class API {
     get user(): {
         id: string;
         username: string;
-        role: string;
+        role: Role;
         createdAt: Date;
         isAdmin: boolean;
     };
     set user(user: {
         id: string;
         username: string;
-        role: string;
+        role: Role;
         createdAt: Date;
         isAdmin: boolean;
     });
@@ -148,9 +189,9 @@ export declare class API {
     /** If {@link API.setNewToken} has been called, you can wait for it to be done through this promise */
     private token_promise;
     /**
-     * This creates a new {@link API.token}, alongside a new {@link API.refresh_token} if arguments are provided or if a refresh_token already exists
+     * This contacts the server in order to get and set a new {@link API.token}!
      * @remarks The API object requires a {@link API.username} and a {@link API.password} to successfully get any token
-     * @returns Whether or not the token has changed (this should never throw)
+     * @returns Whether or not the token has changed (**should be true** as otherwise the server would complain and an {@link APIError} would be thrown to give you some details)
      */
     setNewToken(): Promise<boolean>;
     private _set_token_on_401;
@@ -233,54 +274,185 @@ export declare class API {
     request(method: "get" | "post" | "put" | "delete", endpoint: Array<string | number>, parameters?: {
         [k: string]: any;
     }): Promise<any>;
-    getWebsiteStats(website_id: string, startAt: Date, endAt: Date): Promise<{
-        pageviews: ValueAndPrev;
-        visitors: ValueAndPrev;
-        visits: ValueAndPrev;
-        bounces: ValueAndPrev;
-        totaltime: ValueAndPrev;
+    /**
+     * To register an event
+     * (TODO UNTESTED)
+     * @group Sending stats
+     */
+    sendStats(payload: {
+        /** Name of host */
+        hostname: string;
+        /** Screen resolution (ex. "1920x1080") */
+        screen: string;
+        /** Language of visitor (ex. "en-US") */
+        language: string;
+        /** Page URL */
+        url: string;
+        /** Referrer URL */
+        referrer: string;
+        /** Page title */
+        title: string;
+        /** Additional tag description */
+        tag: string;
+        /** Session identifier */
+        id: string;
+        /** Website ID */
+        website: string;
+        /** Name of the event */
+        name: string;
+        /** Additional data for the event */
+        data?: {
+            [k: string]: any;
+        };
+    }): Promise<{
+        cache: string;
+        sessionid: string;
+        visitId: string;
     }>;
+    /** @group Admin endpoints */
     readonly getUsersAsAdmin: typeof Admin.getUsers;
+    /** @group Admin endpoints */
     readonly getWebsitesAsAdmin: typeof Admin.getWebsites;
+    /** @group Admin endpoints */
     readonly getTeamsAsAdmin: typeof Admin.getTeams;
-    readonly createUser: typeof Users.createUser;
-    readonly getUser: typeof Users.getUser;
-    readonly updateUser: typeof Users.updateUser;
-    readonly deleteUser: typeof Users.deleteUser;
-    readonly getUserTeams: typeof Users.getUserTeams;
-    readonly getUserWebsites: typeof Users.getUserWebsites;
-    readonly getTeams: typeof Teams.getTeams;
-    readonly createTeam: typeof Teams.createTeam;
-    readonly joinTeam: typeof Teams.joinTeam;
-    readonly getTeam: typeof Teams.getTeam;
-    readonly updateTeam: typeof Teams.updateTeam;
-    readonly deleteTeam: typeof Teams.deleteTeam;
-    readonly getTeamUsers: typeof Teams.getTeamUsers;
-    readonly addTeamUser: typeof Teams.addTeamUser;
-    readonly getTeamUser: typeof Teams.getTeamUser;
-    readonly updateTeamUser: typeof Teams.updateTeamUser;
-    readonly removeTeamUser: typeof Teams.removeTeamUser;
-    readonly getTeamWebsites: typeof Teams.getTeamWebsites;
-    readonly getWebsiteEvents: typeof Events.getWebsiteEvents;
-    readonly getWebsiteEventData: typeof Events.getWebsiteEventData;
-    readonly getWebsiteEventsData: typeof Events.getWebsiteEventsData;
-    readonly getWebsiteEventsDataFields: typeof Events.getWebsiteEventsDataFields;
-    readonly getWebsiteEventsDataProperties: typeof Events.getWebsiteEventsDataProperties;
-    readonly getWebsiteEventsDataValues: typeof Events.getWebsiteEventsDataValues;
-    readonly getWebsiteEventsDataStats: typeof Events.getWebsiteEventsDataStats;
-    readonly getWebsiteSessions: typeof Sessions.getWebsiteSessions;
-    readonly getWebsiteSessionsStats: typeof Sessions.getWebsiteSessionsStats;
-    readonly getWebsiteSessionsWeekly: typeof Sessions.getWebsiteSessionsWeekly;
-    readonly getWebsiteSession: typeof Sessions.getWebsiteSession;
-    readonly getWebsiteSessionActivity: typeof Sessions.getWebsiteSessionActivity;
-    readonly getWebsiteSessionProperties: typeof Sessions.getWebsiteSessionProperties;
-    readonly getWebsiteSessionDataProperties: typeof Sessions.getWebsiteSessionDataProperties;
-    readonly getWebsiteSessionDataValues: typeof Sessions.getWebsiteSessionDataValues;
-    readonly getWebsites: typeof Websites.getWebsites;
-    readonly createWebsite: typeof Websites.createWebsite;
-    readonly getWebsite: typeof Websites.getWebsite;
-    readonly updateWebsite: typeof Websites.updateWebsite;
-    readonly deleteWebsite: typeof Websites.deleteWebsite;
-    readonly resetWebsite: typeof Websites.resetWebsite;
-    readonly getRealtime: typeof Realtime.getRealtime;
+    /** @group Events endpoints */
+    readonly getWebsiteEvents: typeof Events.get_WEBSITEID_Events;
+    /** @group Events endpoints */
+    readonly getWebsiteEventData: typeof Events.get_WEBSITEID_Eventdata_EVENTID;
+    /** @group Events endpoints */
+    readonly getWebsiteEventsData: typeof Events.get_WEBSITEID_EventdataEvents;
+    /** @group Events endpoints */
+    readonly getWebsiteEventsDataFields: typeof Events.get_WEBSITEID_EventdataFields;
+    /** @group Events endpoints */
+    readonly getWebsiteEventsDataProperties: typeof Events.get_WEBSITEID_EventdataProperties;
+    /** @group Events endpoints */
+    readonly getWebsiteEventsDataValues: typeof Events.get_WEBSITEID_EventdataValues;
+    /** @group Events endpoints */
+    readonly getWebsiteEventsDataStats: typeof Events.get_WEBSITEID_EventdataStats;
+    /** @group Links endpoints */
+    readonly getLinks: typeof Links.get;
+    /** @group Links endpoints */
+    readonly getLink: typeof Links.get_LINKID;
+    /** @group Links endpoints */
+    readonly updateLink: typeof Links.post_LINKID;
+    /** @group Links endpoints */
+    readonly deleteLink: typeof Links.delete_LINKID;
+    /** @group Me endpoints */
+    readonly getMyself: typeof Me.get;
+    /** @group Me endpoints */
+    readonly getMyTeams: typeof Me.getTeams;
+    /** @group Me endpoints */
+    readonly getMyWebsites: typeof Me.getWebsites;
+    /** @group Links endpoints */
+    readonly getPixels: typeof Pixels.get;
+    /** @group Links endpoints */
+    readonly getPixel: typeof Pixels.get_PIXELID;
+    /** @group Links endpoints */
+    readonly updatePixel: typeof Pixels.post_PIXELID;
+    /** @group Links endpoints */
+    readonly deletePixel: typeof Pixels.delete_PIXELID;
+    /** @group Websites endpoints */
+    readonly getWebsites: typeof Websites.get;
+    /** @group Websites endpoints */
+    readonly createWebsite: typeof Websites.post;
+    /** @group Websites endpoints */
+    readonly getWebsite: typeof Websites.get_WEBSITEID;
+    /** @group Websites endpoints */
+    readonly updateWebsite: typeof Websites.post_WEBSITEID;
+    /** @group Websites endpoints */
+    readonly deleteWebsite: typeof Websites.delete_WEBSITEID;
+    /** @group Websites endpoints */
+    readonly resetWebsite: typeof Websites.post_WEBSITEID_Reset;
+    /** @group Website stats endpoints */
+    readonly getWebsiteActiveVisitors: typeof WebsiteStats.get_WEBSITEID_Active;
+    /** @group Website stats endpoints */
+    readonly getWebsiteEventsStats: typeof WebsiteStats.get_WEBSITEID_EventsSeries;
+    /** @group Website stats endpoints */
+    readonly getWebsiteMetrics: typeof WebsiteStats.get_WEBSITEID_Metrics;
+    /** @group Website stats endpoints */
+    readonly getWebsiteMetricsExpanded: typeof WebsiteStats.get_WEBSITEID_MetricsExpanded;
+    /** @group Website stats endpoints */
+    readonly getWebsitePageviews: typeof WebsiteStats.get_WEBSITEID_Pageviews;
+    /** @group Website stats endpoints */
+    readonly getWebsiteStats: typeof WebsiteStats.get_WEBSITEID_Stats;
+    /** @group Realtime endpoints */
+    readonly getRealtime: typeof Realtime.get_WEBSITEID;
+    /** @group Reports endpoints */
+    readonly getReports: typeof Reports.get;
+    /** @group Reports endpoints */
+    readonly createReport: typeof Reports.post;
+    /** @group Reports endpoints */
+    readonly getReport: typeof Reports.get_REPORTID;
+    /** @group Reports endpoints */
+    readonly updateReport: typeof Reports.post_REPORTID;
+    /** @group Reports endpoints */
+    readonly deleteReport: typeof Reports.delete_REPORTID;
+    /** @group Reports endpoints */
+    readonly getReportsAttribution: typeof Reports.postAttribution;
+    /** @group Reports endpoints */
+    readonly getReportsBreakdown: typeof Reports.postBreakdown;
+    /** @group Reports endpoints */
+    readonly getReportsFunnel: typeof Reports.postFunnel;
+    /** @group Reports endpoints */
+    readonly getReportsGoals: typeof Reports.postGoals;
+    /** @group Reports endpoints */
+    readonly getReportsJourney: typeof Reports.postJourney;
+    /** @group Reports endpoints */
+    readonly getReportsRetention: typeof Reports.postRetention;
+    /** @group Reports endpoints */
+    readonly getReportsRevenue: typeof Reports.postRevenue;
+    /** @group Reports endpoints */
+    readonly getReportsUTM: typeof Reports.postUTM;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessions: typeof Sessions.get_WEBSITEID_Sessions;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionsStats: typeof Sessions.get_WEBSITEID_SessionsStats;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionsWeekly: typeof Sessions.get_WEBSITEID_SessionsWeekly;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSession: typeof Sessions.get_WEBSITEID_Sessions_SESSIONID;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionActivity: typeof Sessions.get_WEBSITEID_Sessions_SESSIONID_Activity;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionProperties: typeof Sessions.get_WEBSITEID_Sessions_SESSIONID_Properties;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionDataProperties: typeof Sessions.get_WEBSITEID_SessiondataProperties;
+    /** @group Sessions endpoints */
+    readonly getWebsiteSessionDataValues: typeof Sessions.get_WEBSITEID_SessiondataValues;
+    /** @group Teams endpoints */
+    readonly getTeams: typeof Teams.get;
+    /** @group Teams endpoints */
+    readonly createTeam: typeof Teams.post;
+    /** @group Teams endpoints */
+    readonly joinTeam: typeof Teams.postJoin;
+    /** @group Teams endpoints */
+    readonly getTeam: typeof Teams.get_TEAMID;
+    /** @group Teams endpoints */
+    readonly updateTeam: typeof Teams.post_TEAMID;
+    /** @group Teams endpoints */
+    readonly deleteTeam: typeof Teams.delete_TEAMID;
+    /** @group Teams endpoints */
+    readonly getTeamUsers: typeof Teams.get_TEAMID_Users;
+    /** @group Teams endpoints */
+    readonly addTeamUser: typeof Teams.post_TEAMID_Users;
+    /** @group Teams endpoints */
+    readonly getTeamUser: typeof Teams.get_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    readonly updateTeamUser: typeof Teams.post_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    readonly removeTeamUser: typeof Teams.delete_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    readonly getTeamWebsites: typeof Teams.get_TEAMID_Websites;
+    /** @group Users endpoints */
+    readonly createUser: typeof Users.post;
+    /** @group Users endpoints */
+    readonly getUser: typeof Users.get_USERID;
+    /** @group Users endpoints */
+    readonly updateUser: typeof Users.post_USERID;
+    /** @group Users endpoints */
+    readonly deleteUser: typeof Users.delete_USERID;
+    /** @group Users endpoints */
+    readonly getUserTeams: typeof Users.get_USERID_Teams;
+    /** @group Users endpoints */
+    readonly getUserWebsites: typeof Users.get_USERID_Websites;
 }

package/dist/index.js

@@ -1,12 +1,17 @@
 import { Admin } from "./namespaces/Admin.js";
 import { Events } from "./namespaces/Events.js";
+import { Links } from "./namespaces/Links.js";
+import { Me } from "./namespaces/Me.js";
+import { Pixels } from "./namespaces/Pixels.js";
 import { Realtime } from "./namespaces/Realtime.js";
+import { Reports } from "./namespaces/Reports.js";
 import { Sessions } from "./namespaces/Sessions.js";
 import { Teams } from "./namespaces/Teams.js";
 import { Users } from "./namespaces/Users.js";
 import { Websites } from "./namespaces/Websites.js";
+import { WebsiteStats } from "./namespaces/WebsiteStats.js";
 import { adaptParametersForGETRequests, correctType } from "./utilities.js";
-export { Admin, Users, Teams, Events, Sessions, Websites, Realtime };
+export { Admin, Events, Links, Me, Pixels, Websites, WebsiteStats, Realtime, Reports, Sessions, Teams, Users };
 /** If the {@link API} throws an error, it should always be an {@link APIError}! */
 export class APIError extends Error {
     message;
@@ -111,9 +116,9 @@ export class API {
     /** If {@link API.setNewToken} has been called, you can wait for it to be done through this promise */
     token_promise = new Promise(r => r);
     /**
-     * This creates a new {@link API.token}, alongside a new {@link API.refresh_token} if arguments are provided or if a refresh_token already exists
+     * This contacts the server in order to get and set a new {@link API.token}!
      * @remarks The API object requires a {@link API.username} and a {@link API.password} to successfully get any token
-     * @returns Whether or not the token has changed (this should never throw)
+     * @returns Whether or not the token has changed (**should be true** as otherwise the server would complain and an {@link APIError} would be thrown to give you some details)
      */
     async setNewToken() {
         const old_token = this.token;
@@ -132,8 +137,8 @@ export class API {
                         this.log(true, "Unable to obtain a token! Here's what was received from the API:", json);
                         reject(new APIError(error_message, this.server, "post", ["auth", "login"], body, response.status));
                     }
-                    this.token_type = json.token_type;
                     this.token = json.token;
+                    this.user = json.user;
                     const expiration_date = new Date();
                     expiration_date.setDate(expiration_date.getDate() + 1); // Assume 24 hours
                     this.expires = expiration_date;
@@ -376,57 +381,171 @@ export class API {
             throw new APIError(`${e?.name} (${e?.message ?? e?.errno ?? e?.type})`, this.server, method, endpoint, parameters, undefined, e);
         }
     }
-    async getWebsiteStats(website_id, startAt, endAt) {
-        return await this.request("get", ["websites", website_id, "stats"], { startAt, endAt });
+    // UNCATEGORIZED
+    /**
+     * To register an event
+     * (TODO UNTESTED)
+     * @group Sending stats
+     */
+    async sendStats(payload) {
+        return await this.request("post", ["send"], { payload, type: "event" });
     }
     // ADMIN
+    /** @group Admin endpoints */
     getUsersAsAdmin = Admin.getUsers;
+    /** @group Admin endpoints */
     getWebsitesAsAdmin = Admin.getWebsites;
+    /** @group Admin endpoints */
     getTeamsAsAdmin = Admin.getTeams;
-    // USERS
-    createUser = Users.createUser;
-    getUser = Users.getUser;
-    updateUser = Users.updateUser;
-    deleteUser = Users.deleteUser;
-    getUserTeams = Users.getUserTeams;
-    getUserWebsites = Users.getUserWebsites;
-    // TEAMS
-    getTeams = Teams.getTeams;
-    createTeam = Teams.createTeam;
-    joinTeam = Teams.joinTeam;
-    getTeam = Teams.getTeam;
-    updateTeam = Teams.updateTeam;
-    deleteTeam = Teams.deleteTeam;
-    getTeamUsers = Teams.getTeamUsers;
-    addTeamUser = Teams.addTeamUser;
-    getTeamUser = Teams.getTeamUser;
-    updateTeamUser = Teams.updateTeamUser;
-    removeTeamUser = Teams.removeTeamUser;
-    getTeamWebsites = Teams.getTeamWebsites;
     // EVENTS
-    getWebsiteEvents = Events.getWebsiteEvents;
-    getWebsiteEventData = Events.getWebsiteEventData;
-    getWebsiteEventsData = Events.getWebsiteEventsData;
-    getWebsiteEventsDataFields = Events.getWebsiteEventsDataFields;
-    getWebsiteEventsDataProperties = Events.getWebsiteEventsDataProperties;
-    getWebsiteEventsDataValues = Events.getWebsiteEventsDataValues;
-    getWebsiteEventsDataStats = Events.getWebsiteEventsDataStats;
-    // SESSIONS
-    getWebsiteSessions = Sessions.getWebsiteSessions;
-    getWebsiteSessionsStats = Sessions.getWebsiteSessionsStats;
-    getWebsiteSessionsWeekly = Sessions.getWebsiteSessionsWeekly;
-    getWebsiteSession = Sessions.getWebsiteSession;
-    getWebsiteSessionActivity = Sessions.getWebsiteSessionActivity;
-    getWebsiteSessionProperties = Sessions.getWebsiteSessionProperties;
-    getWebsiteSessionDataProperties = Sessions.getWebsiteSessionDataProperties;
-    getWebsiteSessionDataValues = Sessions.getWebsiteSessionDataValues;
+    /** @group Events endpoints */
+    getWebsiteEvents = Events.get_WEBSITEID_Events;
+    /** @group Events endpoints */
+    getWebsiteEventData = Events.get_WEBSITEID_Eventdata_EVENTID;
+    /** @group Events endpoints */
+    getWebsiteEventsData = Events.get_WEBSITEID_EventdataEvents;
+    /** @group Events endpoints */
+    getWebsiteEventsDataFields = Events.get_WEBSITEID_EventdataFields;
+    /** @group Events endpoints */
+    getWebsiteEventsDataProperties = Events.get_WEBSITEID_EventdataProperties;
+    /** @group Events endpoints */
+    getWebsiteEventsDataValues = Events.get_WEBSITEID_EventdataValues;
+    /** @group Events endpoints */
+    getWebsiteEventsDataStats = Events.get_WEBSITEID_EventdataStats;
+    // LINKS
+    /** @group Links endpoints */
+    getLinks = Links.get;
+    /** @group Links endpoints */
+    getLink = Links.get_LINKID;
+    /** @group Links endpoints */
+    updateLink = Links.post_LINKID;
+    /** @group Links endpoints */
+    deleteLink = Links.delete_LINKID;
+    // ME
+    /** @group Me endpoints */
+    getMyself = Me.get;
+    /** @group Me endpoints */
+    getMyTeams = Me.getTeams;
+    /** @group Me endpoints */
+    getMyWebsites = Me.getWebsites;
+    // PIXELS
+    /** @group Links endpoints */
+    getPixels = Pixels.get;
+    /** @group Links endpoints */
+    getPixel = Pixels.get_PIXELID;
+    /** @group Links endpoints */
+    updatePixel = Pixels.post_PIXELID;
+    /** @group Links endpoints */
+    deletePixel = Pixels.delete_PIXELID;
     // WEBSITES
-    getWebsites = Websites.getWebsites;
-    createWebsite = Websites.createWebsite;
-    getWebsite = Websites.getWebsite;
-    updateWebsite = Websites.updateWebsite;
-    deleteWebsite = Websites.deleteWebsite;
-    resetWebsite = Websites.resetWebsite;
+    /** @group Websites endpoints */
+    getWebsites = Websites.get;
+    /** @group Websites endpoints */
+    createWebsite = Websites.post;
+    /** @group Websites endpoints */
+    getWebsite = Websites.get_WEBSITEID;
+    /** @group Websites endpoints */
+    updateWebsite = Websites.post_WEBSITEID;
+    /** @group Websites endpoints */
+    deleteWebsite = Websites.delete_WEBSITEID;
+    /** @group Websites endpoints */
+    resetWebsite = Websites.post_WEBSITEID_Reset;
+    // WEBSITE STATS
+    /** @group Website stats endpoints */
+    getWebsiteActiveVisitors = WebsiteStats.get_WEBSITEID_Active;
+    /** @group Website stats endpoints */
+    getWebsiteEventsStats = WebsiteStats.get_WEBSITEID_EventsSeries;
+    /** @group Website stats endpoints */
+    getWebsiteMetrics = WebsiteStats.get_WEBSITEID_Metrics;
+    /** @group Website stats endpoints */
+    getWebsiteMetricsExpanded = WebsiteStats.get_WEBSITEID_MetricsExpanded;
+    /** @group Website stats endpoints */
+    getWebsitePageviews = WebsiteStats.get_WEBSITEID_Pageviews;
+    /** @group Website stats endpoints */
+    getWebsiteStats = WebsiteStats.get_WEBSITEID_Stats;
     // REALTIME
-    getRealtime = Realtime.getRealtime;
+    /** @group Realtime endpoints */
+    getRealtime = Realtime.get_WEBSITEID;
+    // REPORTS
+    /** @group Reports endpoints */
+    getReports = Reports.get;
+    /** @group Reports endpoints */
+    createReport = Reports.post;
+    /** @group Reports endpoints */
+    getReport = Reports.get_REPORTID;
+    /** @group Reports endpoints */
+    updateReport = Reports.post_REPORTID;
+    /** @group Reports endpoints */
+    deleteReport = Reports.delete_REPORTID;
+    /** @group Reports endpoints */
+    getReportsAttribution = Reports.postAttribution;
+    /** @group Reports endpoints */
+    getReportsBreakdown = Reports.postBreakdown;
+    /** @group Reports endpoints */
+    getReportsFunnel = Reports.postFunnel;
+    /** @group Reports endpoints */
+    getReportsGoals = Reports.postGoals;
+    /** @group Reports endpoints */
+    getReportsJourney = Reports.postJourney;
+    /** @group Reports endpoints */
+    getReportsRetention = Reports.postRetention;
+    /** @group Reports endpoints */
+    getReportsRevenue = Reports.postRevenue;
+    /** @group Reports endpoints */
+    getReportsUTM = Reports.postUTM;
+    // SESSIONS
+    /** @group Sessions endpoints */
+    getWebsiteSessions = Sessions.get_WEBSITEID_Sessions;
+    /** @group Sessions endpoints */
+    getWebsiteSessionsStats = Sessions.get_WEBSITEID_SessionsStats;
+    /** @group Sessions endpoints */
+    getWebsiteSessionsWeekly = Sessions.get_WEBSITEID_SessionsWeekly;
+    /** @group Sessions endpoints */
+    getWebsiteSession = Sessions.get_WEBSITEID_Sessions_SESSIONID;
+    /** @group Sessions endpoints */
+    getWebsiteSessionActivity = Sessions.get_WEBSITEID_Sessions_SESSIONID_Activity;
+    /** @group Sessions endpoints */
+    getWebsiteSessionProperties = Sessions.get_WEBSITEID_Sessions_SESSIONID_Properties;
+    /** @group Sessions endpoints */
+    getWebsiteSessionDataProperties = Sessions.get_WEBSITEID_SessiondataProperties;
+    /** @group Sessions endpoints */
+    getWebsiteSessionDataValues = Sessions.get_WEBSITEID_SessiondataValues;
+    // TEAMS
+    /** @group Teams endpoints */
+    getTeams = Teams.get;
+    /** @group Teams endpoints */
+    createTeam = Teams.post;
+    /** @group Teams endpoints */
+    joinTeam = Teams.postJoin;
+    /** @group Teams endpoints */
+    getTeam = Teams.get_TEAMID;
+    /** @group Teams endpoints */
+    updateTeam = Teams.post_TEAMID;
+    /** @group Teams endpoints */
+    deleteTeam = Teams.delete_TEAMID;
+    /** @group Teams endpoints */
+    getTeamUsers = Teams.get_TEAMID_Users;
+    /** @group Teams endpoints */
+    addTeamUser = Teams.post_TEAMID_Users;
+    /** @group Teams endpoints */
+    getTeamUser = Teams.get_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    updateTeamUser = Teams.post_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    removeTeamUser = Teams.delete_TEAMID_Users_USERID;
+    /** @group Teams endpoints */
+    getTeamWebsites = Teams.get_TEAMID_Websites;
+    // USERS
+    /** @group Users endpoints */
+    createUser = Users.post;
+    /** @group Users endpoints */
+    getUser = Users.get_USERID;
+    /** @group Users endpoints */
+    updateUser = Users.post_USERID;
+    /** @group Users endpoints */
+    deleteUser = Users.delete_USERID;
+    /** @group Users endpoints */
+    getUserTeams = Users.get_USERID_Teams;
+    /** @group Users endpoints */
+    getUserWebsites = Users.get_USERID_Websites;
 }

package/dist/namespaces/Admin.d.ts

@@ -1,42 +1,23 @@
-import { API, GenericObject, GenericRequestParameters, Role, Teams } from "../index.js";
-/** For endpoints listed on: https://umami.is/docs/api/admin-api */
+import { API, GenericObject, GenericRequestParameters, MinimalUser, Role, Teams, Website } from "../index.js";
+/** Operations around admin management: https://umami.is/docs/api/admin */
 export declare namespace Admin {
-    /** Returns all users: https://umami.is/docs/api/admin-api#get-apiadminusers */
+    /** Returns all users: https://umami.is/docs/api/admin#get-apiadminusers */
     function getUsers(this: API, parameters?: GenericRequestParameters): Promise<(GenericObject & {
         username: string;
-        /** @remarks **UNDOCUMENTED** & seems encrypted (thankfully, lol) */
-        password: string;
         role: Role;
         logoUrl: string | null;
         displayName: string | null;
         _count: {
-            /** @remarks **UNDOCUMENTED**, documented uncorrectly as `websites`? */
-            websiteUser: number;
+            websites: number;
         };
     })[]>;
-    /**
-     * Returns all websites: https://umami.is/docs/api/admin-api#get-apiadminwebsites
-     * @remarks TODO Possibly doesn't work? (throws 400 on my end)
-     */
-    function getWebsites(this: API, parameters?: GenericRequestParameters): Promise<(GenericObject & {
-        name: string;
-        domain: string;
-        shareId: number | null;
-        resetAt: Date | null;
-        userId: string;
-        teamid: string | null;
-        createdBy: string;
-        user: {
-            username: string;
-            id: string;
-        };
+    /** Returns all websites: https://umami.is/docs/api/admin#get-apiadminwebsites */
+    function getWebsites(this: API, parameters?: GenericRequestParameters): Promise<(Website & {
+        user: MinimalUser;
         /** @remarks TODO Documentation says it can be null but doesn't actually say what else it can be, ***presumed* to be string**, check */
         team: string | null;
     })[]>;
-    /**
-     * Returns all teams: https://umami.is/docs/api/admin-api#get-apiadminteams
-     * @remarks TODO Possibly doesn't work? (throws 404 on my end)
-     */
+    /** Returns all teams: https://umami.is/docs/api/admin#get-apiadminteams */
     function getTeams(this: API, parameters?: GenericRequestParameters): Promise<(GenericObject & {
         name: string;
         accessCode: string;