@secrecy/lib 1.56.0 → 1.57.0

package/dist/lib/base-client.js

@@ -15,21 +15,24 @@ async function getPublicUser(client, id) {
     return user;
 }
 export class BaseClient {
-    static getBaseClient = (session, onAccessDenied) => createTRPCClient(session, onAccessDenied);
+    static getBaseClient = (opts = {}) => createTRPCClient(opts);
     client;
     sessionId;
-    constructor(session, onAccessDenied) {
-        this.sessionId = session;
-        this.client = BaseClient.getBaseClient(session, async () => {
-            console.log('[BASE_CLIENT - BEFORE] - Access denied');
-            await onAccessDenied?.();
-            console.log('[BASE_CLIENT - AFTER] - Access denied');
-            try {
-                await this.logout();
-            }
-            finally {
-                location.reload();
-            }
+    constructor(opts) {
+        this.sessionId = opts.session;
+        this.client = BaseClient.getBaseClient({
+            ...opts,
+            onAccessDenied: async () => {
+                console.log('[BASE_CLIENT - BEFORE] - Access denied');
+                await opts.onAccessDenied?.();
+                console.log('[BASE_CLIENT - AFTER] - Access denied');
+                try {
+                    await this.logout();
+                }
+                finally {
+                    location.reload();
+                }
+            },
         });
     }
     async logout(sessionId) {
@@ -43,8 +46,8 @@ export class BaseClient {
     async me() {
         return await this.client.user.self.query({});
     }
-    static async getUser(userId, sessionId) {
-        const user = await getPublicUser(this.getBaseClient(sessionId), userId);
+    static async getUser(userId, session) {
+        const user = await getPublicUser(this.getBaseClient({ session }), userId);
         return user;
     }
     async getUser(userId) {

package/dist/lib/client/index.js

@@ -27,14 +27,17 @@ export class SecrecyClient extends BaseClient {
     user;
     pseudonym;
     constructor(uaSession, uaKeys, uaJwt) {
-        super(uaSession, async () => {
-            console.log('[CLIENT] - Access denied');
-            try {
-                await this.logout();
-            }
-            catch {
-                // ignore
-            }
+        super({
+            session: uaSession,
+            onAccessDenied: async () => {
+                console.log('[CLIENT] - Access denied');
+                try {
+                    await this.logout();
+                }
+                catch {
+                    // ignore
+                }
+            },
         });
         this.#keys = uaKeys;
         this.cloud = new SecrecyCloudClient(this, this.#keys, this.client);

package/dist/lib/client.js

@@ -9,19 +9,7 @@ superjson.registerCustom({
     serialize: (v) => [...v],
     deserialize: (v) => Buffer.from(v),
 }, 'buffer');
-export const getUrl = () => {
-    if (process.env.NEXT_PUBLIC_SECRECY_URL) {
-        return `${process.env.NEXT_PUBLIC_SECRECY_URL}/api/trpc`;
-    }
-    const protocol = process.env.NEXT_PUBLIC_VERCEL_ENV !== 'development' ? 'https' : 'http';
-    const url = process.env.NEXT_PUBLIC_VERCEL_ENV &&
-        process.env.NEXT_PUBLIC_VERCEL_ENV !== 'production' &&
-        process.env.NEXT_PUBLIC_IS_SECRECY_INTERNAL === 'true'
-        ? `${protocol}://${process.env.NEXT_PUBLIC_VERCEL_URL}/api/trpc`
-        : `https://www.secrecy.tech/api/trpc`;
-    return url;
-};
-export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClient({
+export const createTRPCClient = (opts) => createTRPCProxyClient({
     transformer: superjson,
     links: [
         loggerLink({
@@ -29,14 +17,14 @@ export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClie
                 if (op.direction === 'down' &&
                     isTRPCClientError(op.result) &&
                     op.result.data?.code === 'UNAUTHORIZED') {
-                    void onAccessDenied?.();
+                    void opts.onAccessDenied?.();
                 }
                 return (process.env.NODE_ENV === 'development' ||
                     (op.direction === 'down' && op.result instanceof Error));
             },
         }),
         httpBatchLink({
-            url: getUrl(),
+            url: opts.apiUrl ?? 'https://secrecy.tech/api/trpc',
             maxURLLength: 2083,
             fetch: async (input, init) => {
                 const controller = new AbortController();
@@ -45,8 +33,8 @@ export const createTRPCClient = (session, onAccessDenied) => createTRPCProxyClie
                 }, 20000);
                 const headers = new Headers(init?.headers);
                 headers.set('secrecy-lib-version', SECRECY_LIB_VERSION);
-                if (typeof session === 'string') {
-                    headers.set('secrecy-session', session);
+                if (typeof opts.session === 'string') {
+                    headers.set('secrecy-session', opts.session);
                 }
                 const call = fetch(input, {
                     ...init,

package/dist/types/base-client.d.ts

@@ -1,15 +1,20 @@
-import { type ApiClient, type RouterOutputs, type RouterInputs } from './client.js';
+import { type ApiClient, type RouterOutputs, type RouterInputs, CreateTrpcClientOptions } from './client.js';
 import { type InfuraNetwork, type PublicUser } from './index.js';
 import { type SelfUser } from './client/types/user.js';
+export type BaseClientOptions = {
+    session: string;
+    apiUrl?: string | null | undefined;
+    onAccessDenied?: () => void | Promise<void>;
+};
 export declare class BaseClient {
     #private;
-    static readonly getBaseClient: (session?: string | null | undefined, onAccessDenied?: () => void | Promise<void>) => ApiClient;
+    static readonly getBaseClient: (opts?: CreateTrpcClientOptions) => ApiClient;
     protected client: ApiClient;
     sessionId: string;
-    constructor(session: string, onAccessDenied?: () => void | Promise<void>);
+    constructor(opts: BaseClientOptions);
     logout(sessionId?: string | null | undefined): Promise<void>;
     me(): Promise<SelfUser>;
-    static getUser(userId: string, sessionId?: string | null | undefined): Promise<PublicUser>;
+    static getUser(userId: string, session?: string | undefined): Promise<PublicUser>;
     getUser(userId: string): Promise<PublicUser>;
     searchUsers(search: string): Promise<PublicUser[]>;
     updateProfile(data: RouterInputs['user']['updateProfile']): Promise<Omit<SelfUser, 'account'>>;

package/dist/types/client.d.ts

@@ -5,8 +5,12 @@ import superjson from 'superjson';
 export type RouterInputs = inferRouterInputs<AppRouter>;
 export type RouterOutputs = inferRouterOutputs<AppRouter>;
 export declare function isTRPCClientError(cause: unknown): cause is TRPCClientError<AppRouter>;
-export declare const getUrl: () => string;
-export declare const createTRPCClient: (session?: string | null | undefined, onAccessDenied?: () => void | Promise<void>) => {
+export interface CreateTrpcClientOptions {
+    session?: string | null | undefined;
+    apiUrl?: string | null | undefined;
+    onAccessDenied?: () => void | Promise<void> | null | undefined;
+}
+export declare const createTRPCClient: (opts: CreateTrpcClientOptions) => {
     account: {
         createUser: {
             mutate: import("@trpc/client").Resolver<import("@trpc/server").BuildProcedure<"mutation", {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@secrecy/lib",
   "author": "Anonymize <anonymize@gmail.com>",
   "description": "Anonymize Secrecy Library",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/anonymize-org/lib.git"