@mateosuarezdev/brpc 1.0.71 → 1.0.74

package/dist/auth/index.d.ts

@@ -1,3 +1,3 @@
-export { AuthService, createAuth } from "./service";
-export { COOKIE_NAMES, setAuthCookies, clearAuthCookies, parseCookies } from "./cookies";
-export type { AppMetadata, AuthConfig, AuthResponse, ContactMethod, DecodedJWT, EmailSignIn, EmailSignUp, IdentityData, IdentityRecord, OTPProvider, OTPRecord, OTPResponse, PhoneSignIn, PhoneSignUp, Session, SessionRecord, SignInMethod, SignUpMethod, SignUpOptions, UserRecord, UserResponse, } from "./types";
+export * from "./service";
+export * from "./cookies";
+export * from "./types";

package/dist/auth/index.js

@@ -1,4 +1,4 @@
 // @bun
-export{r as setAuthCookies,d as parseCookies,n as createAuth,p as clearAuthCookies,s as COOKIE_NAMES,t as AuthService};
+import*as v from"jsonwebtoken";import{RecordId as L,DateTime as I,Table as q,eq as y,or as u,surql as W}from"surrealdb";import*as X from"bcryptjs";import c from"node-cron";import a from"crypto";class Q extends Error{code;clientCode;httpStatus;data;cause;static STATUS_MAP={BAD_REQUEST:400,UNAUTHORIZED:401,FORBIDDEN:403,NOT_FOUND:404,METHOD_NOT_SUPPORTED:405,TIMEOUT:408,CONFLICT:409,PRECONDITION_FAILED:412,PAYLOAD_TOO_LARGE:413,UNPROCESSABLE_CONTENT:422,TOO_MANY_REQUESTS:429,CLIENT_CLOSED_REQUEST:499,INTERNAL_SERVER_ERROR:500,NOT_IMPLEMENTED:501,BAD_GATEWAY:502,SERVICE_UNAVAILABLE:503,GATEWAY_TIMEOUT:504};constructor($){super($.message);if(this.name="BRPCError",this.code=$.code,this.clientCode=$.clientCode,this.httpStatus=Q.STATUS_MAP[$.code],this.data=$.data,this.cause=$.cause,Error.captureStackTrace)Error.captureStackTrace(this,Q)}toJSON(){return{name:this.name,code:this.code,clientCode:this.clientCode,message:this.message,data:this.data,httpStatus:this.httpStatus}}static badRequest($,K,j){return new Q({code:"BAD_REQUEST",message:$,clientCode:K,data:j})}static unauthorized($="Unauthorized",K,j){return new Q({code:"UNAUTHORIZED",message:$,clientCode:K,data:j})}static forbidden($="Forbidden",K,j){return new Q({code:"FORBIDDEN",message:$,clientCode:K,data:j})}static notFound($="Not Found",K,j){return new Q({code:"NOT_FOUND",message:$,clientCode:K,data:j})}static preconditionFailed($="Precondition failed",K,j){return new Q({code:"NOT_FOUND",message:$,clientCode:K,data:j})}static conflict($,K,j){return new Q({code:"CONFLICT",message:$,clientCode:K,data:j})}static unprocessableContent($,K,j){return new Q({code:"UNPROCESSABLE_CONTENT",message:$,clientCode:K,data:j})}static tooManyRequests($="Too many requests",K,j){return new Q({code:"TOO_MANY_REQUESTS",message:$,clientCode:K,data:j})}static internalServerError($="Internal Server Error",K,j){return new Q({code:"INTERNAL_SERVER_ERROR",message:$,clientCode:K,data:j})}static timeout($="Request timeout",K,j){return new Q({code:"TIMEOUT",message:$,clientCode:K,data:j})}}var O={ACCESS_TOKEN:"access_token",REFRESH_TOKEN:"refresh_token",SESSION_ID:"session_id"},P={httpOnly:!0,sameSite:"Lax",path:"/",maxAge:1209600};function w($){return Object.entries($).map(([K,j])=>{if(j===void 0||j===null)return"";switch(K){case"maxAge":return`Max-Age=${j}`;case"httpOnly":return j?"HttpOnly":"";case"secure":return j?"Secure":"";case"sameSite":return`SameSite=${j}`;case"domain":return`Domain=${j}`;case"path":return`Path=${j}`;default:return`${K}=${j}`}}).filter(Boolean).join("; ")}function o($,K,j){let F={...P,secure:j};[`${O.ACCESS_TOKEN}=${K.accessToken}; ${w(F)}`,`${O.REFRESH_TOKEN}=${K.refreshToken}; ${w(F)}`,`${O.SESSION_ID}=${K.sessionId}; ${w({...F,maxAge:86400})}`].forEach((G)=>$.append("Set-Cookie",G))}function r($,K){let j={...P,secure:K,maxAge:0};[O.ACCESS_TOKEN,O.REFRESH_TOKEN,O.SESSION_ID].forEach((F)=>$.append("Set-Cookie",`${F}=; ${w(j)}`))}function T($){if(!$)return{};return $.split(";").reduce((K,j)=>{let F=j.trim().split("="),G=F[0],J=F.slice(1).join("=");if(G&&J)K[G]=J;return K},{})}var n=10,i=3,g=15,t=3,s=["cf-connecting-ip","x-real-ip","x-client-ip","x-forwarded","forwarded-for","x-forwarded-host"],b=new q("users"),U=new q("user_identities"),D=new q("sessions"),C=new q("otp_codes");function Y($){return`${$.table}:${$.id}`}function N($=new Date){return new I($)}class E{db;defaultSignupRoles;constructor($,K){this.db=$;this.defaultSignupRoles=K}async findByEmail($){let[K]=await this.db.select(b).where(y("email",$)).limit(1);return K}async findByPhone($){let[K]=await this.db.select(b).where(y("phone",$)).limit(1);return K}async findByContact($){if(!$.email&&!$.phone)return;let K=[];if($.email)K.push(y("email",$.email));if($.phone)K.push(y("phone",$.phone));let[j]=await this.db.select(b).where(u(...K)).limit(1);return j}async findById($){let[K,j]=$.split(":");return await this.db.select(new L(K,j))??void 0}async create({email:$,phone:K,options:j,ctx:F=this.db}){let[G]=await F.create(b).content({email:$??null,phone:K??null,app_metadata:{...j?.appMetadata,roles:this.defaultSignupRoles},last_sign_in_at:null});if(!G)throw Q.internalServerError("Failed to create user","USER_CREATE_FAILED");return G}async updateAppMetadata($,K){let j=await this.findById($);if(!j)throw Q.notFound("User not found","USER_NOT_FOUND");await this.db.update(j.id).merge({app_metadata:K})}async updateUserMetadata($,K){let j=await this.findById($);if(!j)throw Q.notFound("User not found","USER_NOT_FOUND");await this.db.update(j.id).merge({user_metadata:K})}async updateLastSignIn($,K=this.db){let[j,F]=$.split(":");await K.update(new L(j,F)).merge({last_sign_in_at:N()})}}class S{db;constructor($){this.db=$}async findByProvider($,K){let[j]=await this.db.query(W`SELECT * FROM type::table(${U}) WHERE provider = ${$} AND provider_id = ${K} LIMIT 1`);return j?.[0]}async findByUserId($){let[K,j]=$.split(":"),F=new L(K,j),[G]=await this.db.query(W`SELECT * FROM type::table(${U}) WHERE user_id = ${F}`);return G??[]}async findPasswordIdentity($){let[K,j]=$.split(":"),F=new L(K,j),[G]=await this.db.query(W`SELECT * FROM type::table(${U}) WHERE user_id = ${F} AND identity_data.password_hash != NONE LIMIT 1`);return G?.[0]}async create({userId:$,provider:K,providerId:j,identityData:F={},ctx:G=this.db}){let[J]=await G.create(U).content({user_id:$,provider:K,provider_id:j,identity_data:F});if(!J)throw Q.internalServerError("Failed to create identity","IDENTITY_CREATE_FAILED");return J}async updateData($,K){await this.db.update($).merge({identity_data:K})}}class m{db;debug;constructor($,K){this.db=$;this.debug=K}async create({userId:$,req:K,ctx:j=this.db}){let F=this.getClientIP(K),G=K.headers.get("user-agent"),[J,V]=$.split(":"),A=new L(J,V),[Z]=await j.create(D).content({user_id:A,ip_address:F,user_agent:G,invalidated_at:null});if(!Z)throw Q.internalServerError("Failed to create session","SESSION_CREATE_FAILED");return k(Z)}async get($){let[K,j]=$.split(":"),F=await this.db.select(new L(K,j));if(!F||F.invalidated_at)return;return k(F)}async getUserSessions($){let[K,j]=$.split(":"),F=new L(K,j),[G]=await this.db.query(W`SELECT * FROM type::table(${D}) WHERE user_id = ${F} AND invalidated_at = null`);return(G??[]).map((J)=>({id:Y(J.id),ipAddress:J.ip_address,userAgent:J.user_agent,invalidatedAt:J.invalidated_at}))}async invalidate($){let[K,j]=$.split(":");await this.db.update(new L(K,j)).merge({invalidated_at:N()})}async invalidateAllForUser($){let[K,j]=$.split(":"),F=new L(K,j);await this.db.query(W`UPDATE type::table(${D}) SET invalidated_at = time::now() WHERE user_id = ${F} AND invalidated_at = null`)}async invalidateAllExceptCurrent($,K){let[j,F]=$.split(":"),[G,J]=K.split(":"),V=new L(j,F),A=new L(G,J);await this.db.query(W`UPDATE type::table(${D}) SET invalidated_at = time::now() WHERE user_id = ${V} AND id != ${A} AND invalidated_at = null`)}async cleanup(){let[$]=await this.db.query(W`DELETE type::table(${D}) WHERE invalidated_at != NONE AND invalidated_at != null RETURN BEFORE`);return $?.length??0}getClientIP($){let K=$.headers.get("x-forwarded-for");if(K)return K.split(",")[0].trim();for(let j of s){let F=$.headers.get(j);if(F)return F.trim()}return this.debug?"127.0.0.1":null}}class h{db;otpProvider;constructor($,K){this.db=$;this.otpProvider=K}async checkRateLimit($){let K=new Date;K.setMinutes(K.getMinutes()-g);let j=[];if($.email)j.push(W`email = ${$.email}`);if($.phone)j.push(W`phone = ${$.phone}`);let F=j.length===1?j[0]:W`(${j[0]} OR ${j[1]})`,[G]=await this.db.query(W`SELECT * FROM type::table(${C}) WHERE (${F}) AND created_at >= ${N(K)}`);if((G?.length??0)>=t)throw Q.tooManyRequests(`Too many OTP requests. Please wait ${g} minutes.`,"OTP_RATE_LIMIT")}async generate({user:$,type:K,signupOptions:j}){await this.checkRateLimit({email:$.email,phone:$.phone});let F=a.randomInt(1e5,999999).toString(),G=await X.hash(F,10),J=new Date;J.setMinutes(J.getMinutes()+n);let V=$.id?(()=>{let[Z,_]=$.id.split(":");return new L(Z,_)})():null,[A]=await this.db.create(C).content({user_id:V,email:$.email??null,phone:$.phone??null,code:F,hashed_code:G,type:K,signup_options:j??null,expires_at:N(J),attempts:0,verified_at:null});if(!A)throw Q.internalServerError("Failed to create OTP record","OTP_CREATE_FAILED");try{await this.sendOTP({email:$.email,phone:$.phone,code:F})}catch{throw await this.db.delete(A.id),Q.internalServerError("Failed to send OTP","OTP_SEND_FAILED")}return{otpId:Y(A.id),expiresAt:J.toISOString(),message:`OTP sent to ${$.email?"email":"phone"}`}}async verify($,K){let[j,F]=$.split(":"),G=await this.db.select(new L(j,F));if(!G)throw Q.notFound("Invalid OTP","INVALID_OTP");if(new Date>new Date(G.expires_at))throw Q.badRequest("OTP has expired","OTP_EXPIRED");if(G.verified_at)throw Q.badRequest("OTP already used","OTP_ALREADY_USED");if(G.attempts>=i)throw Q.badRequest("Too many failed attempts","OTP_MAX_ATTEMPTS");if(!await X.compare(K,G.hashed_code))throw await this.db.update(G.id).merge({attempts:G.attempts+1}),Q.badRequest("Invalid OTP code","INVALID_OTP_CODE");return await this.db.update(G.id).merge({verified_at:N()}),G}async cleanup(){let $=N(),[K]=await this.db.query(W`DELETE type::table(${C}) WHERE expires_at < ${$} OR verified_at != NONE RETURN BEFORE`);return K?.length??0}async sendOTP({email:$,phone:K,code:j}){if($&&this.otpProvider?.sendEmailOTP)await this.otpProvider.sendEmailOTP({email:$,code:j});if(K&&this.otpProvider?.sendSMSOTP)await this.otpProvider.sendSMSOTP({phone:K,code:j})}}class R{jwtSecret;jwtRefreshSecret;accessTokenExpiry;constructor($,K,j){this.jwtSecret=$;this.jwtRefreshSecret=K;this.accessTokenExpiry=j}generateAccessToken($){return v.sign($,this.jwtSecret,{expiresIn:this.accessTokenExpiry})}generateRefreshToken($,K){return v.sign({sub:$,sessionId:K},this.jwtRefreshSecret)}verifyAccessToken($){return v.verify($,this.jwtSecret)}verifyRefreshToken($){return v.verify($,this.jwtRefreshSecret)}}function f($){return{id:Y($.id),email:$.email,phone:$.phone,appMetadata:$.app_metadata,userMetadata:$.user_metadata}}function k($){return{id:Y($.id),userId:Y($.user_id),ipAddress:$.ip_address,userAgent:$.user_agent,invalidatedAt:$.invalidated_at}}class p{userManager;identityManager;sessionManager;otpManager;tokenManager;cache;config;constructor($){this.config=$,this.userManager=new E($.db,$.defaultSignupRoles),this.identityManager=new S($.db),this.sessionManager=new m($.db,$.debug??!1),this.otpManager=new h($.db,$.otpProvider),this.tokenManager=new R($.secrets.jwt,$.secrets.jwtRefresh,$.accessTokenExpiry??"24h"),this.cache=$.cache?new $.cache({ttl:900000,maxSize:500,cleanupInterval:300000}):null}async initialize(){if(!this.config.disableCleanupCron)this.initializeCleanup()}async signUp($,K){this.validateSignUpMethod($);let{provider:j,providerId:F}=this.extractIdentityKey($);if(await this.identityManager.findByProvider(j,F))throw Q.conflict("User already exists","USER_ALREADY_EXISTS");let J=this.extractContact($);if($.passwordless||!$.password)return this.startPasswordlessSignUp(J,$.options);return this.completePasswordSignUp(j,F,J,$.password,K,$.options)}async signIn($,K){this.validateSignInMethod($);let{provider:j,providerId:F}=this.extractIdentityKey($),G=await this.identityManager.findByProvider(j,F);if(!G)throw Q.notFound(`No account found with this ${$.type}`,"USER_NOT_FOUND");if($.passwordless||!$.password)return this.startPasswordlessSignIn(G);return this.completePasswordSignIn(G,$.password,K)}async verifyOTP($,K,j){let F=await this.otpManager.verify($,K);if(F.type==="signup")return this.completePasswordlessSignUp(F,j);if(F.type==="signin")return this.completePasswordlessSignIn(F,j);throw Q.badRequest("Invalid OTP type","INVALID_OTP_TYPE")}async signOut($){await this.sessionManager.invalidate($)}async signOutAll($){await this.sessionManager.invalidateAllForUser($)}async signOutAllExcept($,K){await this.sessionManager.invalidateAllExceptCurrent($,K)}async getUserSessions($){return this.sessionManager.getUserSessions($)}async refreshTokens($){let K=this.tokenManager.verifyRefreshToken($),j=await this.sessionManager.get(K.sessionId);if(!j)throw Q.notFound("Session not found","SESSION_NOT_FOUND");if(j.userId!==K.sub)throw Q.conflict("Session mismatch","SESSION_USER_MISMATCH");let F=await this.userManager.findById(K.sub);if(!F)throw Q.notFound("User not found","USER_NOT_FOUND");let G=this.tokenManager.generateAccessToken({sub:Y(F.id),sessionId:j.id,appMetadata:F.app_metadata,userMetadata:F.user_metadata}),J=this.tokenManager.generateRefreshToken(Y(F.id),j.id);return{accessToken:G,refreshToken:J,sessionId:j.id,user:f(F)}}async verifyToken($){try{if(!$||!$.startsWith("Bearer "))return null;let K=$.split(" ")[1],j=this.tokenManager.verifyAccessToken(K),F=await this.sessionManager.get(j.sessionId);if(!F||F.userId!==j.sub)return null;let G=await this.userManager.findById(j.sub);if(!G)return null;return{sub:j.sub,sessionId:j.sessionId,appMetadata:G.app_metadata,userMetadata:G.user_metadata,exp:j.exp}}catch{return null}}async fastVerifyToken($){try{if(!$||!$.startsWith("Bearer "))return null;let K=$.split(" ")[1];return this.tokenManager.verifyAccessToken(K)}catch{return null}}async verifyTokenFromCookie($){if(!$)return null;let j=T($)[O.ACCESS_TOKEN];if(!j)return null;return this.verifyToken(`Bearer ${j}`)}async refreshTokenFromCookie($){if(!$)return null;let j=T($)[O.REFRESH_TOKEN];if(!j)return null;try{return await this.refreshTokens(j)}catch{return null}}async getUserById($){return this.userManager.findById($)}async getUserByContact($){return this.userManager.findByContact($)}async getUserIdentities($){return this.identityManager.findByUserId($)}async updateUserPassword($,K){let j=await this.identityManager.findPasswordIdentity($);if(!j)throw Q.notFound("No password identity found","NO_PASSWORD_SET");let F=await X.hash(K,10);await this.identityManager.updateData(j.id,{password_hash:F})}async updateAppMetadata($,K){return this.userManager.updateAppMetadata($,K)}async updateUserMetadata($,K){return this.userManager.updateUserMetadata($,K)}async changePassword($,K,j){let F=await this.identityManager.findPasswordIdentity($);if(!F)throw Q.badRequest("User has no password set","NO_PASSWORD_SET");if(!await X.compare(K,F.identity_data.password_hash))throw Q.badRequest("Current password is incorrect","INVALID_PASSWORD");let J=await X.hash(j,10);await this.identityManager.updateData(F.id,{password_hash:J})}async requestPasswordReset($){let K=$.email?"email":"phone",j=$.email??$.phone,F=await this.identityManager.findByProvider(K,j);if(!F)throw Q.notFound("User not found","USER_NOT_FOUND");let G=Y(F.user_id);return this.otpManager.generate({user:{id:G,email:$.email,phone:$.phone},type:"password_reset"})}async resetPassword($,K,j){let F=await this.otpManager.verify($,K);if(F.type!=="password_reset")throw Q.badRequest("Invalid OTP type for password reset","INVALID_OTP_TYPE");if(!F.user_id)throw Q.internalServerError("Invalid OTP record","INVALID_OTP_RECORD");let G=F.email?"email":"phone",J=F.email??F.phone,V=await this.identityManager.findByProvider(G,J);if(!V)throw Q.internalServerError("Identity not found","IDENTITY_NOT_FOUND");let A=await X.hash(j,10);await this.identityManager.updateData(V.id,{password_hash:A});let Z=Y(F.user_id);return await this.sessionManager.invalidateAllForUser(Z),{success:!0}}async adminCreateUser({email:$,phone:K,password:j,options:F}){let G=j?await X.hash(j,10):null,J=await this.config.db.beginTransaction();try{let[V]=await J.create(b).content({email:$??null,phone:K??null,app_metadata:{...F?.appMetadata,roles:this.config.defaultSignupRoles},last_sign_in_at:null});if(!V)throw Error("Failed to create user");if($||K){let A=$?"email":"phone",Z=$??K;await J.create(U).content({user_id:V.id,provider:A,provider_id:Z,identity_data:G?{password_hash:G}:{}})}return await J.commit(),f(V)}catch(V){throw await J.cancel(),V}}cacheSession($,K){this.cache?.set($,K)}getCachedSession($){return this.cache?.get($)??null}invalidateCachedSession($){return this.cache?.delete($)??!1}getCacheStats(){return this.cache?.stats()??null}clearCache(){this.cache?.clear()}isTokenNearExpiry($){return $-Math.floor(Date.now()/1000)<300}async testCreateUserWithSession({email:$,phone:K,password:j,options:F,req:G}){let J=j?await X.hash(j,10):null,V=this.sessionManager.getClientIP(G),A=await this.config.db.beginTransaction();try{let[Z]=await A.create(b).content({email:$??null,phone:K??null,app_metadata:{...F?.appMetadata,roles:this.config.defaultSignupRoles},last_sign_in_at:N()});if(!Z)throw Error("Failed to create user");if($||K){let B=$?"email":"phone",l=$??K;await A.create(U).content({user_id:Z.id,provider:B,provider_id:l,identity_data:J?{password_hash:J}:{}})}let[_]=await A.create(D).content({user_id:Z.id,ip_address:V,user_agent:G.headers.get("user-agent"),invalidated_at:null});if(!_)throw Error("Failed to create session");let H=Y(Z.id),z=Y(_.id),x=this.tokenManager.generateAccessToken({sub:H,sessionId:z,appMetadata:Z.app_metadata,userMetadata:Z.user_metadata}),M=this.tokenManager.generateRefreshToken(H,z);return await A.commit(),{user:f(Z),session:k(_),accessToken:x,refreshToken:M}}catch(Z){throw await A.cancel(),Z}}async startPasswordlessSignUp($,K){return this.otpManager.generate({user:{id:void 0,email:$.email,phone:$.phone},type:"signup",signupOptions:K})}async startPasswordlessSignIn($){let K=Y($.user_id),j=$.provider==="email"?$.provider_id:void 0,F=$.provider==="phone"?$.provider_id:void 0;return this.otpManager.generate({user:{id:K,email:j,phone:F},type:"signin"})}async completePasswordSignUp($,K,j,F,G,J){let V=await X.hash(F,10),A=await this.config.db.beginTransaction();try{let[Z]=await A.create(b).content({email:j.email??null,phone:j.phone??null,app_metadata:{...J?.appMetadata,roles:this.config.defaultSignupRoles},last_sign_in_at:N()});if(!Z)throw Error("Failed to create user");let[_]=await A.create(U).content({user_id:Z.id,provider:$,provider_id:K,identity_data:{password_hash:V}});if(!_)throw Error("Failed to create identity");let H=this.sessionManager.getClientIP(G),[z]=await A.create(D).content({user_id:Z.id,ip_address:H,user_agent:G.headers.get("user-agent"),invalidated_at:null});if(!z)throw Error("Failed to create session");let x=Y(Z.id),M=Y(z.id),B=this.tokenManager.generateAccessToken({sub:x,sessionId:M,appMetadata:Z.app_metadata,userMetadata:Z.user_metadata}),l=this.tokenManager.generateRefreshToken(x,M);return await A.commit(),{user:f(Z),session:k(z),accessToken:B,refreshToken:l}}catch(Z){throw await A.cancel(),Z}}async completePasswordSignIn($,K,j){let{password_hash:F}=$.identity_data;if(!F)throw Q.conflict("This account has no password. Use OTP to sign in.","NO_PASSWORD_SET");if(!await X.compare(K,F))throw Q.conflict("Invalid credentials","INVALID_CREDENTIALS");let J=Y($.user_id),V=await this.userManager.findById(J);if(!V)throw Q.notFound("User not found","USER_NOT_FOUND");return this.createAuthSession(V,j)}async completePasswordlessSignUp($,K){let j=$.email?"email":"phone",F=$.email??$.phone,G=$.signup_options,J=await this.config.db.beginTransaction();try{let[V]=await J.create(b).content({email:$.email??null,phone:$.phone??null,app_metadata:{...G?.appMetadata,roles:this.config.defaultSignupRoles},last_sign_in_at:N()});if(!V)throw Error("Failed to create user");let[A]=await J.create(U).content({user_id:V.id,provider:j,provider_id:F,identity_data:{}});if(!A)throw Error("Failed to create identity");let Z=this.sessionManager.getClientIP(K),[_]=await J.create(D).content({user_id:V.id,ip_address:Z,user_agent:K.headers.get("user-agent"),invalidated_at:null});if(!_)throw Error("Failed to create session");let H=Y(V.id),z=Y(_.id),x=this.tokenManager.generateAccessToken({sub:H,sessionId:z,appMetadata:V.app_metadata,userMetadata:V.user_metadata}),M=this.tokenManager.generateRefreshToken(H,z);return await J.commit(),{user:f(V),session:k(_),accessToken:x,refreshToken:M}}catch(V){throw await J.cancel(),V}}async completePasswordlessSignIn($,K){if(!$.user_id)throw Q.internalServerError("Invalid OTP record","INVALID_OTP_RECORD");let j=Y($.user_id),F=await this.userManager.findById(j);if(!F)throw Q.notFound("User not found","USER_NOT_FOUND");return this.createAuthSession(F,K)}async createAuthSession($,K){let j=await this.config.db.beginTransaction();try{let F=this.sessionManager.getClientIP(K),[G]=await j.create(D).content({user_id:$.id,ip_address:F,user_agent:K.headers.get("user-agent"),invalidated_at:null});if(!G)throw Error("Failed to create session");await j.update($.id).merge({last_sign_in_at:N()});let J=Y($.id),V=Y(G.id),A=this.tokenManager.generateAccessToken({sub:J,sessionId:V,appMetadata:$.app_metadata,userMetadata:$.user_metadata}),Z=this.tokenManager.generateRefreshToken(J,V);return await j.commit(),{user:f($),session:k(G),accessToken:A,refreshToken:Z}}catch(F){throw await j.cancel(),F}}validateSignUpMethod($){if($.type==="email")this.validateEmail($.email);else $.phone=this.normalizePhoneNumber($.phone)}validateSignInMethod($){if($.type==="email")this.validateEmail($.email);else $.phone=this.normalizePhoneNumber($.phone)}validateEmail($){if(!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test($))throw Q.badRequest("Invalid email format","INVALID_EMAIL")}normalizePhoneNumber($){let K=$.replace(/\D/g,"");if(K.length===10)return`+1${K}`;if(K.length===11&&K.startsWith("1"))return`+${K}`;if(!K.startsWith("+"))return`+${K}`;return K}extractContact($){return $.type==="email"?{email:$.email}:{phone:$.phone}}extractIdentityKey($){return $.type==="email"?{provider:"email",providerId:$.email}:{provider:"phone",providerId:$.phone}}initializeCleanup(){Promise.all([this.sessionManager.cleanup(),this.otpManager.cleanup()]).catch(()=>{}),c.schedule("0 2 * * *",async()=>{await Promise.all([this.sessionManager.cleanup(),this.otpManager.cleanup()]).catch(()=>{})})}}function Q$($){return new p($)}export{o as setAuthCookies,T as parseCookies,Q$ as createAuth,r as clearAuthCookies,O as COOKIE_NAMES,p as AuthService};
 
-//# debugId=6CBC2D2D58A69A8964756E2164756E21
+//# debugId=16FC8A4D37BA05A064756E2164756E21

package/dist/auth/service.d.ts

@@ -61,7 +61,7 @@ export declare class AuthService<TAppMetadata extends AppMetadata = AppMetadata,
             expiresIn: number | null;
             age: number;
         }[];
-    };
+    } | null;
     clearCache(): void;
     isTokenNearExpiry(exp: number): boolean;
     testCreateUserWithSession({ email, phone, password, options, req, }: {

package/dist/auth/types.d.ts

@@ -1,4 +1,5 @@
 import type { RecordId, Surreal } from "surrealdb";
+import type { CacheService } from "../cache";
 export type AppMetadata = {
     roles: string[];
     [key: string]: unknown;
@@ -125,15 +126,15 @@ export type PhoneSignIn = {
 export type SignUpMethod<TAppMetadata extends AppMetadata = AppMetadata, TUserMetadata extends UserMetadata = UserMetadata> = EmailSignUp<TAppMetadata, TUserMetadata> | PhoneSignUp<TAppMetadata, TUserMetadata>;
 export type SignInMethod = EmailSignIn | PhoneSignIn;
 export interface OTPProvider {
-    sendEmailOTP(params: {
+    sendEmailOTP?(params: {
         email: string;
         code: string;
     }): Promise<any>;
-    sendSMSOTP(params: {
+    sendSMSOTP?(params: {
         phone: string;
         code: string;
     }): Promise<any>;
-    sendWhatsAppOTP(params: {
+    sendWhatsAppOTP?(params: {
         phone: string;
         code: string;
     }): Promise<any>;
@@ -145,6 +146,7 @@ export type AuthConfig<TAppMetadata extends AppMetadata = AppMetadata> = {
         jwtRefresh: string;
     };
     defaultSignupRoles: TAppMetadata["roles"];
+    cache?: typeof CacheService;
     otpProvider?: OTPProvider;
     accessTokenExpiry?: string;
     isProd?: boolean;

package/dist/client/index.js

@@ -1,4 +1,4 @@
 // @bun
-function b(q,G={placeholder:void 0,throwOnInvalid:!0},N){if(!q)return G?.placeholder??"PLACEHOLDER";if(q.url)return q.url;if(q.key)if(q.isPrivate||q.provider==="local")return`/storage/${q.key}`;else return`${N}/${q.key}`;if(G.throwOnInvalid)throw Error("Invalid storage object");else return G?.placeholder??"PLACEHOLDER"}class T extends Error{status;code;clientCode;data;constructor(q,G,N,Q,R){super(q);this.name="BrpcClientError",this.status=G,this.code=N,this.clientCode=Q,this.data=R}isClientError(q){return this.clientCode===q}isUnauthorized(){return this.status===401}isForbidden(){return this.status===403}isNotFound(){return this.status===404}isValidationError(){return this.status===400||this.code==="BAD_REQUEST"}}var U=(q)=>{return q instanceof File||q instanceof Blob||typeof q==="object"&&q!==null&&"uri"in q&&"name"in q&&"type"in q};function x(q){if(!q)return null;return q.replace(/\//g,"")}function v(q){let G=q&&q.length>0?q:typeof window<"u"?window.location.origin:"";return G=G.endsWith("/")?G.slice(0,-1):G,G}function m(q,G){let N=G?`/${G}/ws`:"/ws";return`${q.replace(/^http/,"ws")}${N}`}function k(q,G){if(q&&G)return`/${q}/${G}`;else if(q&&!G)return`/${q}`;else if(!q&&G)return`/${G}`;else return""}class h{baseUrl;ws=null;subscriptions=new Map;messageQueue=[];isConnected=!1;reconnectTimeout=null;WebSocketImpl;getHeaders;authToken=null;debug;pendingAuth=!1;authActions=[];constructor(q,G,N,Q=!1,R){this.baseUrl=q;this.WebSocketImpl=G,this.debug=Q&&R==="development",this.getHeaders=async()=>{if(typeof N==="function")return await N();return N??{}},this.connect()}async connect(){try{let q=await this.getHeaders();this.authToken=q.Authorization||null;let G=this.baseUrl;if(this.debug)console.log(`Connecting to WebSocket: ${G}`);this.ws=new this.WebSocketImpl(G),this.ws.onopen=async()=>{if(this.debug)console.log("WebSocket connection established");if(this.isConnected=!0,this.authActions=[],this.authToken){if(this.pendingAuth=!0,this.send({type:"authenticate",token:this.authToken}),this.debug)console.log("Sent authentication token, waiting for response");this.authActions.push(()=>{for(let N of this.subscriptions.keys())if(this.send({type:"subscribe",topic:N}),this.debug)console.log(`Resubscribed to topic: ${N}`);if(this.messageQueue.length>0&&this.debug)console.log(`Sending ${this.messageQueue.length} queued messages`);this.messageQueue.forEach((N)=>this.send(N)),this.messageQueue=[]})}else{for(let N of this.subscriptions.keys())if(this.send({type:"subscribe",topic:N}),this.debug)console.log(`Resubscribed to topic: ${N}`);if(this.messageQueue.length>0&&this.debug)console.log(`Sending ${this.messageQueue.length} queued messages`);this.messageQueue.forEach((N)=>this.send(N)),this.messageQueue=[]}},this.ws.onmessage=(N)=>{try{if(this.debug)console.log("WebSocket message received:",N.data);let Q=JSON.parse(N.data);if(Q.type==="auth_success"){let R=Q.authenticated!==!1;if(this.debug)console.log(`WebSocket ${R?"authentication":"deauthentication"} successful`);if(this.pendingAuth=!1,R)this.authActions.forEach((S)=>S());this.authActions=[];return}if(Q.type==="auth_error"){console.error("WebSocket authentication failed:",Q.error),this.pendingAuth=!1,this.authActions=[];return}if(this.debug)console.log("Got new message",Q);if(Q.topic&&this.subscriptions.has(Q.topic)){let R=this.subscriptions.get(Q.topic);if(this.debug)console.log("Calling subscription callbacks");R?.forEach((S)=>S(Q.data))}else if(Q.error)console.error("WebSocket error:",Q.error);else console.warn("Unhandled WebSocket message format:",Q)}catch(Q){if(this.debug)console.error("Error processing WebSocket message:",Q),console.error("Raw message:",N.data)}},this.ws.onclose=(N)=>{if(this.isConnected=!1,this.pendingAuth=!1,this.debug)console.log(`WebSocket connection closed. Code: ${N.code}, Reason: ${N.reason}`);this.reconnectTimeout=setTimeout(()=>this.connect(),2000)},this.ws.onerror=(N)=>{if(this.debug)console.log("WebSocket error:",N)}}catch(q){if(this.debug)console.log("Failed to create WebSocket connection:",q);this.pendingAuth=!1,this.reconnectTimeout=setTimeout(()=>this.connect(),2000)}}disconnect(){if(this.reconnectTimeout)clearTimeout(this.reconnectTimeout),this.reconnectTimeout=null;if(this.ws)this.ws.close(),this.ws=null;this.isConnected=!1,this.pendingAuth=!1,this.authActions=[],this.subscriptions.clear()}send(q){if(this.isConnected&&this.ws?.readyState===this.WebSocketImpl.OPEN){if(this.pendingAuth&&q.type!=="authenticate"){if(this.messageQueue.push(q),this.debug)console.log("Message queued until authentication completes:",q);return}let G=JSON.stringify(q);if(this.ws.send(G),this.debug)console.log("WebSocket message sent:",G)}else if(this.messageQueue.push(q),this.debug)console.log("WebSocket message queued (not connected):",q)}subscribe(q,G){if(!this.subscriptions.has(q)){if(this.subscriptions.set(q,new Set),this.isConnected){if(this.pendingAuth)this.authActions.push(()=>{if(this.send({type:"subscribe",topic:q}),this.debug)console.log(`Subscribed to topic after auth: ${q}`)});else if(this.send({type:"subscribe",topic:q}),this.debug)console.log(`Subscribed to topic: ${q}`)}}return this.subscriptions.get(q).add(G),{unsubscribe:()=>this.unsubscribe(q,G),publish:(N)=>this.publish(q,N)}}unsubscribe(q,G){let N=this.subscriptions.get(q);if(N){if(N.delete(G),N.size===0){if(this.subscriptions.delete(q),this.send({type:"unsubscribe",topic:q}),this.debug)console.log(`Unsubscribed from topic: ${q}`)}}}publish(q,G){if(this.send({type:"publish",topic:q,data:G}),this.debug)console.log(`Published to topic: ${q}`,G)}async updateAuth(){let G=(await this.getHeaders()).Authorization||"",N=G.startsWith("Bearer ")?G.substring(7).trim():G.trim(),Q=N.length>0,R=this.authToken!==null&&this.authToken.trim().length>0;if((Q!==R||N!==this.authToken)&&this.isConnected){if(this.authToken=N,this.pendingAuth=Q,this.send({type:"authenticate",token:G}),this.debug)if(Q)console.log("Updated authentication token, waiting for confirmation");else console.log("Sent empty token for deauthentication"),this.pendingAuth=!1,this.authActions=[]}}}function Qq(q,G={}){let N=G.fetch||fetch,Q=G.WebSocket??(typeof WebSocket<"u"?WebSocket:null),R=G.prefix??"",S=G.apiPrefix??"",M=G.debug??!1,g=G.s3Endpoint,c=G.nodeEnv;if(!G.s3Endpoint)throw Error("BRPC Client: Pass s3Endpoint option to createBrpcClient");if(!G.nodeEnv)throw Error("BRPC Client: Pass nodeEnv option to createBrpcClient");if(!Q)throw Error("WebSocket is not available in this environment");let w=G.headers??{},d=async()=>{if(typeof w==="function")return await w();return w},j=v(q),f=x(G.prefix),u=x(G.apiPrefix),D=k(f,u),P=m(j,f),B=new h(P,Q,w,M,c),O=async(X=!0)=>{let I={};if(X)I["Content-Type"]="application/json";let J=await d();return{...I,...J}},n=async(X)=>{if(!X.ok){let J;try{J=await X.json()}catch{try{J={error:await X.text()}}catch{J={error:"Failed to parse error response"}}}if(J?.error&&typeof J.error==="object"){let A=J.error;throw new T(A.message||X.statusText,X.status,A.code,A.clientCode,A.data)}let $=J?.error||J?.message||X.statusText;throw new T($,X.status,void 0,void 0,J)}let I=X.headers.get("Content-Type")||"";try{if(I.includes("application/json"))return(await X.json()).data;else if(I.includes("text/"))return X.text();else return X.blob()}catch(J){throw new T(`Failed to parse response: ${J instanceof Error?J.message:"Unknown error"}`,X.status,"PARSE_ERROR")}},H=async(X,I)=>{try{let J=await N(X,I);return await n(J)}catch(J){if(J instanceof T)throw J;throw new T(J instanceof Error?J.message:"Network request failed",0,"NETWORK_ERROR")}},y=(X=[])=>{return new Proxy({},{get(I,J){if(typeof J==="symbol")return;if(J==="query"||J==="mutation"||J==="formMutation"||J==="subscription"||J==="getStringKey"||J==="getArrayKey"||J==="getNoInputsArrayKey"){let $=X.join("/"),A=`${j}${D}/${$}`;if(M)console.log(`BRPC ${J} procedure path: ${$}`),console.log(`BRPC ${J} full URL: ${A}`);if(J==="query")return async(Z)=>{let L=await O(!0);if(M)console.log(`BRPC query request to ${$}`,{input:Z,headers:L});let _=new URL(A);if(Z&&typeof Z==="object")Object.entries(Z).forEach(([W,F])=>{if(F!==void 0)_.searchParams.append(W,String(F))});let z=await H(_.toString(),{method:"GET",headers:L,credentials:"include"});if(M)console.log(`BRPC query response from ${$}:`,z);return z};else if(J==="mutation")return async(Z)=>{let L=await O(!0);if(M)console.log(`BRPC mutation request to ${$}`,{input:Z,headers:L});let _=JSON.stringify(Z),z=await H(A,{method:"POST",headers:L,body:_,credentials:"include"});if(M)console.log(`BRPC mutation response from ${$}:`,z);return z};else if(J==="formMutation")return async(Z)=>{let L=await O(!1);if(M)console.log(`BRPC formMutation request to ${$}`,{input:Z,headers:L});let _=new FormData,z=(F,Y,C)=>{let V=C?`${C}[${F}]`:F;if(Y===null||Y===void 0)return;else if(U(Y))_.append(V,Y);else if(Array.isArray(Y))Y.forEach((E,K)=>{if(U(E))_.append(V,E);else if(typeof E==="object"&&E!==null)Object.entries(E).forEach(([i,p])=>{z(i,p,`${V}[${K}]`)});else _.append(`${V}[${K}]`,String(E))});else if(typeof Y==="object"&&Y!==null)Object.entries(Y).forEach(([E,K])=>{z(E,K,V)});else _.append(V,String(Y))};Object.entries(Z).forEach(([F,Y])=>{z(F,Y)});let W=await H(A,{method:"POST",headers:L,body:_,credentials:"include"});if(M)console.log(`BRPC formMutation response from ${$}:`,W);return W};else if(J==="subscription")return(Z)=>{if(M)console.log(`BRPC subscription to ${$}`);let L=D?`${D.slice(1)}/${$}`:$;return B.updateAuth(),B.subscribe(L,Z)};else if(J==="getStringKey")return(Z)=>{let L=$;if(!Z||Object.keys(Z).length===0)return L;let _=Object.keys(Z).sort().reduce((W,F)=>{let Y=Z[F];if(Y!==void 0&&Y!==null)W[F]=Y;return W},{});if(Object.keys(_).length===0)return L;let z=JSON.stringify(_);return`${L}?${z}`};else if(J==="getArrayKey")return(Z,L)=>{let _=$,z={...Z??{},...L??{}};if(Object.keys(z).length===0)return[_];let W=[];if(Object.keys(z).sort().forEach((Y)=>{let C=z[Y];if(C!==void 0&&C!==null){let V=C;if(typeof C==="boolean"||typeof C==="number")V=String(C);else if(typeof C==="object")V=JSON.stringify(C);W.push([Y,V])}}),W.length===0)return[_];let F=W.flatMap(([Y,C])=>[Y,C]);return[_,...F]};else if(J==="getNoInputsArrayKey")return()=>{return[$]}}return y([...X,J])}})},l=y();if(M)console.log("BRPC client created",{baseUrl:j,prefix:D,wsUrl:P});return{routes:l,storage:{getObjectUrl:(X,I)=>b(X,I,g)},utils:{updateWsAuth:async()=>await B.updateAuth(),setHeader:async(X,I)=>{if(typeof w==="function"){console.warn("Cannot use setHeader with function-based headers resolver");return}w={...w,[X]:I},await B.updateAuth()},setHeaders:async(X)=>{if(typeof w==="function"){console.warn("Cannot use setHeaders with function-based headers resolver");return}w={...w,...X},await B.updateAuth()}}}}export{b as getObjectUrl,Qq as createBrpcClient,T as BrpcClientError};
+function g(q){return(J)=>{if(!J)return null;return`${q}/${J}`}}class A extends Error{status;code;clientCode;data;constructor(q,J,O,Q,C){super(q);this.name="BrpcClientError",this.status=J,this.code=O,this.clientCode=Q,this.data=C}isClientError(q){return this.clientCode===q}isUnauthorized(){return this.status===401}isForbidden(){return this.status===403}isNotFound(){return this.status===404}isValidationError(){return this.status===400||this.code==="BAD_REQUEST"}}var U=(q)=>{return q instanceof File||q instanceof Blob||typeof q==="object"&&q!==null&&"uri"in q&&"name"in q&&"type"in q};function x(q){if(!q)return null;return q.replace(/\//g,"")}function v(q){let J=q&&q.length>0?q:typeof window<"u"?window.location.origin:"";return J=J.endsWith("/")?J.slice(0,-1):J,J}function m(q,J){let O=J?`/${J}/ws`:"/ws";return`${q.replace(/^http/,"ws")}${O}`}function y(q,J){if(q&&J)return`/${q}/${J}`;else if(q&&!J)return`/${q}`;else if(!q&&J)return`/${J}`;else return""}class b{baseUrl;ws=null;subscriptions=new Map;messageQueue=[];isConnected=!1;reconnectTimeout=null;WebSocketImpl;getHeaders;authToken=null;debug;pendingAuth=!1;authActions=[];constructor(q,J,O,Q=!1,C){this.baseUrl=q;this.WebSocketImpl=J,this.debug=Q&&C==="development",this.getHeaders=async()=>{if(typeof O==="function")return await O();return O??{}},this.connect()}async connect(){try{let q=await this.getHeaders();this.authToken=q.Authorization||null;let J=this.baseUrl;if(this.debug)console.log(`Connecting to WebSocket: ${J}`);this.ws=new this.WebSocketImpl(J),this.ws.onopen=async()=>{if(this.debug)console.log("WebSocket connection established");if(this.isConnected=!0,this.authActions=[],this.authToken){if(this.pendingAuth=!0,this.send({type:"authenticate",token:this.authToken}),this.debug)console.log("Sent authentication token, waiting for response");this.authActions.push(()=>{for(let O of this.subscriptions.keys())if(this.send({type:"subscribe",topic:O}),this.debug)console.log(`Resubscribed to topic: ${O}`);if(this.messageQueue.length>0&&this.debug)console.log(`Sending ${this.messageQueue.length} queued messages`);this.messageQueue.forEach((O)=>this.send(O)),this.messageQueue=[]})}else{for(let O of this.subscriptions.keys())if(this.send({type:"subscribe",topic:O}),this.debug)console.log(`Resubscribed to topic: ${O}`);if(this.messageQueue.length>0&&this.debug)console.log(`Sending ${this.messageQueue.length} queued messages`);this.messageQueue.forEach((O)=>this.send(O)),this.messageQueue=[]}},this.ws.onmessage=(O)=>{try{if(this.debug)console.log("WebSocket message received:",O.data);let Q=JSON.parse(O.data);if(Q.type==="auth_success"){let C=Q.authenticated!==!1;if(this.debug)console.log(`WebSocket ${C?"authentication":"deauthentication"} successful`);if(this.pendingAuth=!1,C)this.authActions.forEach((B)=>B());this.authActions=[];return}if(Q.type==="auth_error"){console.error("WebSocket authentication failed:",Q.error),this.pendingAuth=!1,this.authActions=[];return}if(this.debug)console.log("Got new message",Q);if(Q.topic&&this.subscriptions.has(Q.topic)){let C=this.subscriptions.get(Q.topic);if(this.debug)console.log("Calling subscription callbacks");C?.forEach((B)=>B(Q.data))}else if(Q.error)console.error("WebSocket error:",Q.error);else console.warn("Unhandled WebSocket message format:",Q)}catch(Q){if(this.debug)console.error("Error processing WebSocket message:",Q),console.error("Raw message:",O.data)}},this.ws.onclose=(O)=>{if(this.isConnected=!1,this.pendingAuth=!1,this.debug)console.log(`WebSocket connection closed. Code: ${O.code}, Reason: ${O.reason}`);this.reconnectTimeout=setTimeout(()=>this.connect(),2000)},this.ws.onerror=(O)=>{if(this.debug)console.log("WebSocket error:",O)}}catch(q){if(this.debug)console.log("Failed to create WebSocket connection:",q);this.pendingAuth=!1,this.reconnectTimeout=setTimeout(()=>this.connect(),2000)}}disconnect(){if(this.reconnectTimeout)clearTimeout(this.reconnectTimeout),this.reconnectTimeout=null;if(this.ws)this.ws.close(),this.ws=null;this.isConnected=!1,this.pendingAuth=!1,this.authActions=[],this.subscriptions.clear()}send(q){if(this.isConnected&&this.ws?.readyState===this.WebSocketImpl.OPEN){if(this.pendingAuth&&q.type!=="authenticate"){if(this.messageQueue.push(q),this.debug)console.log("Message queued until authentication completes:",q);return}let J=JSON.stringify(q);if(this.ws.send(J),this.debug)console.log("WebSocket message sent:",J)}else if(this.messageQueue.push(q),this.debug)console.log("WebSocket message queued (not connected):",q)}subscribe(q,J){if(!this.subscriptions.has(q)){if(this.subscriptions.set(q,new Set),this.isConnected){if(this.pendingAuth)this.authActions.push(()=>{if(this.send({type:"subscribe",topic:q}),this.debug)console.log(`Subscribed to topic after auth: ${q}`)});else if(this.send({type:"subscribe",topic:q}),this.debug)console.log(`Subscribed to topic: ${q}`)}}return this.subscriptions.get(q).add(J),{unsubscribe:()=>this.unsubscribe(q,J),publish:(O)=>this.publish(q,O)}}unsubscribe(q,J){let O=this.subscriptions.get(q);if(O){if(O.delete(J),O.size===0){if(this.subscriptions.delete(q),this.send({type:"unsubscribe",topic:q}),this.debug)console.log(`Unsubscribed from topic: ${q}`)}}}publish(q,J){if(this.send({type:"publish",topic:q,data:J}),this.debug)console.log(`Published to topic: ${q}`,J)}async updateAuth(){let J=(await this.getHeaders()).Authorization||"",O=J.startsWith("Bearer ")?J.substring(7).trim():J.trim(),Q=O.length>0,C=this.authToken!==null&&this.authToken.trim().length>0;if((Q!==C||O!==this.authToken)&&this.isConnected){if(this.authToken=O,this.pendingAuth=Q,this.send({type:"authenticate",token:J}),this.debug)if(Q)console.log("Updated authentication token, waiting for confirmation");else console.log("Sent empty token for deauthentication"),this.pendingAuth=!1,this.authActions=[]}}}function Qq(q,J={}){let O=J.fetch||fetch,Q=J.WebSocket??(typeof WebSocket<"u"?WebSocket:null),C=J.prefix??"",B=J.apiPrefix??"",F=J.debug??!1,k=J.s3Endpoint,c=J.nodeEnv;if(!J.s3Endpoint)throw Error("BRPC Client: Pass s3Endpoint option to createBrpcClient");if(!J.nodeEnv)throw Error("BRPC Client: Pass nodeEnv option to createBrpcClient");if(!Q)throw Error("WebSocket is not available in this environment");let W=J.headers??{},d=async()=>{if(typeof W==="function")return await W();return W},D=v(q),f=x(J.prefix),u=x(J.apiPrefix),E=y(f,u),h=m(D,f),T=new b(h,Q,W,F,c),K=async(X=!0)=>{let M={};if(X)M["Content-Type"]="application/json";let N=await d();return{...M,...N}},l=async(X)=>{if(!X.ok){let N;try{N=await X.json()}catch{try{N={error:await X.text()}}catch{N={error:"Failed to parse error response"}}}if(N?.error&&typeof N.error==="object"){let V=N.error;throw new A(V.message||X.statusText,X.status,V.code,V.clientCode,V.data)}let $=N?.error||N?.message||X.statusText;throw new A($,X.status,void 0,void 0,N)}let M=X.headers.get("Content-Type")||"";try{if(M.includes("application/json"))return(await X.json()).data;else if(M.includes("text/"))return X.text();else return X.blob()}catch(N){throw new A(`Failed to parse response: ${N instanceof Error?N.message:"Unknown error"}`,X.status,"PARSE_ERROR")}},H=async(X,M)=>{try{let N=await O(X,M);return await l(N)}catch(N){if(N instanceof A)throw N;throw new A(N instanceof Error?N.message:"Network request failed",0,"NETWORK_ERROR")}},P=(X=[])=>{return new Proxy({},{get(M,N){if(typeof N==="symbol")return;if(N==="query"||N==="mutation"||N==="formMutation"||N==="subscription"||N==="getStringKey"||N==="getArrayKey"||N==="getNoInputsArrayKey"){let $=X.join("/"),V=`${D}${E}/${$}`;if(F)console.log(`BRPC ${N} procedure path: ${$}`),console.log(`BRPC ${N} full URL: ${V}`);if(N==="query")return async(Z)=>{let j=await K(!0);if(F)console.log(`BRPC query request to ${$}`,{input:Z,headers:j});let _=new URL(V);if(Z&&typeof Z==="object")Object.entries(Z).forEach(([I,z])=>{if(z!==void 0)_.searchParams.append(I,String(z))});let G=await H(_.toString(),{method:"GET",headers:j,credentials:"include"});if(F)console.log(`BRPC query response from ${$}:`,G);return G};else if(N==="mutation")return async(Z)=>{let j=await K(!0);if(F)console.log(`BRPC mutation request to ${$}`,{input:Z,headers:j});let _=JSON.stringify(Z),G=await H(V,{method:"POST",headers:j,body:_,credentials:"include"});if(F)console.log(`BRPC mutation response from ${$}:`,G);return G};else if(N==="formMutation")return async(Z)=>{let j=await K(!1);if(F)console.log(`BRPC formMutation request to ${$}`,{input:Z,headers:j});let _=new FormData,G=(z,Y,L)=>{let R=L?`${L}[${z}]`:z;if(Y===null||Y===void 0)return;else if(U(Y))_.append(R,Y);else if(Array.isArray(Y))Y.forEach((w,S)=>{if(U(w))_.append(R,w);else if(typeof w==="object"&&w!==null)Object.entries(w).forEach(([i,p])=>{G(i,p,`${R}[${S}]`)});else _.append(`${R}[${S}]`,String(w))});else if(typeof Y==="object"&&Y!==null)Object.entries(Y).forEach(([w,S])=>{G(w,S,R)});else _.append(R,String(Y))};Object.entries(Z).forEach(([z,Y])=>{G(z,Y)});let I=await H(V,{method:"POST",headers:j,body:_,credentials:"include"});if(F)console.log(`BRPC formMutation response from ${$}:`,I);return I};else if(N==="subscription")return(Z)=>{if(F)console.log(`BRPC subscription to ${$}`);let j=E?`${E.slice(1)}/${$}`:$;return T.updateAuth(),T.subscribe(j,Z)};else if(N==="getStringKey")return(Z)=>{let j=$;if(!Z||Object.keys(Z).length===0)return j;let _=Object.keys(Z).sort().reduce((I,z)=>{let Y=Z[z];if(Y!==void 0&&Y!==null)I[z]=Y;return I},{});if(Object.keys(_).length===0)return j;let G=JSON.stringify(_);return`${j}?${G}`};else if(N==="getArrayKey")return(Z,j)=>{let _=$,G={...Z??{},...j??{}};if(Object.keys(G).length===0)return[_];let I=[];if(Object.keys(G).sort().forEach((Y)=>{let L=G[Y];if(L!==void 0&&L!==null){let R=L;if(typeof L==="boolean"||typeof L==="number")R=String(L);else if(typeof L==="object")R=JSON.stringify(L);I.push([Y,R])}}),I.length===0)return[_];let z=I.flatMap(([Y,L])=>[Y,L]);return[_,...z]};else if(N==="getNoInputsArrayKey")return()=>{return[$]}}return P([...X,N])}})},n=P();if(F)console.log("BRPC client created",{baseUrl:D,prefix:E,wsUrl:h});return{routes:n,storage:{getObjectUrl:g(k)},utils:{updateWsAuth:async()=>await T.updateAuth(),setHeader:async(X,M)=>{if(typeof W==="function"){console.warn("Cannot use setHeader with function-based headers resolver");return}W={...W,[X]:M},await T.updateAuth()},setHeaders:async(X)=>{if(typeof W==="function"){console.warn("Cannot use setHeaders with function-based headers resolver");return}W={...W,...X},await T.updateAuth()}}}}export{g as createGetObjectUrl,Qq as createBrpcClient,A as BrpcClientError};
 
-//# debugId=79958F420837D37364756E2164756E21
+//# debugId=706C45AEC3B9A12C64756E2164756E21

package/dist/client/storage.d.ts

@@ -1,12 +1,6 @@
-import type { StorageObject } from "../storage";
-export type GetObjectUrl = (storageObject: StorageObject | null | undefined, options: {
-    placeholder?: string;
-    throwOnInvalid?: boolean;
-}) => string;
+export type GetObjectUrl = (key: string | null | undefined) => string | null;
 /**
- * @returns url of the file
+ * Returns a factory bound to the s3Endpoint configured at client construction.
+ * Pass the key from whichever variant you need — e.g. object.variants.xl?.key
  */
-export declare function getObjectUrl(storageObject: StorageObject | null | undefined, options: {
-    placeholder?: string;
-    throwOnInvalid?: boolean;
-} | undefined, s3Endpoint: string): string;
+export declare function createGetObjectUrl(s3Endpoint: string): GetObjectUrl;

package/dist/storage/images/constants.d.ts

@@ -3,5 +3,6 @@ export declare const IMAGE_VARIANTS: {
     readonly sm: 400;
     readonly md: 800;
     readonly lg: 1200;
+    readonly xl: 1920;
 };
 export declare const DEFAULT_IMAGE_MAX_SIZE = 1920;

package/dist/storage/images/types.d.ts

@@ -37,6 +37,5 @@ export type GetOptimizedImageOptions = {
 };
 export type ImageVariantName = keyof typeof IMAGE_VARIANTS;
 export type GeneratedImageVariants = {
-    original: UploadableImageBuffer;
     variants: Partial<Record<ImageVariantName, UploadableImageBuffer>>;
 };

package/dist/storage/index.js

@@ -1,4 +1,4 @@
 // @bun
-var S=($)=>$.startsWith("image/"),j=($)=>$.startsWith("video/"),q=($)=>$.startsWith("audio/"),F=($)=>$.startsWith("text/")||$.includes("pdf")||$.includes("word")||$.includes("sheet")||$.includes("presentation")||$.includes("opendocument")||$==="application/rtf",N=($)=>$.includes("zip")||$.includes("rar")||$.includes("tar")||$.includes("7z")||$.includes("gzip"),T=($)=>$==="application/javascript"||$==="application/json"||$==="text/html"||$==="text/css"||$==="application/xml"||$.includes("javascript"),z=($)=>$.startsWith("font/")||$.includes("font"),O=($)=>{if(!$)return"other";let W=$.toLowerCase();if(S(W))return"image";if(j(W))return"video";if(q(W))return"audio";if(F(W))return"document";if(N(W))return"archive";if(T(W))return"code";if(z(W))return"font";return"other"},x={isImage:S,isVideo:j,isAudio:q,isDocument:F,isArchive:N,isCode:T,isFont:z};function o(){let W=Buffer.from("Hello, this is a test file for S3 upload!","utf-8");return new File([W],"test.txt",{type:"text/plain"})}function r($,W){if($.url)return $.url;if($.key)if($.isPrivate)return`/storage/${$.key}`;else return`https://${W?.bucket??process.env.AWS_BUCKET}.s3.amazonaws.com/${$.key}`;throw Error("Invalid storage object")}function G($,W){if(!$||$<1||!W||W<1)return"1:1";let H=(L,Q)=>Q===0?L:H(Q,L%Q),J=H($,W);return`${$/J}:${W/J}`}function a($,W){if(!$||!W||$<1||W<1)return"1:1";let H=$/W,J=[{ratio:1,label:"1:1"},{ratio:0.8,label:"4:5"},{ratio:0.75,label:"3:4"},{ratio:0.6666666666666666,label:"2:3"},{ratio:0.5625,label:"9:16"},{ratio:1.5,label:"3:2"},{ratio:1.3333333333333333,label:"4:3"},{ratio:1.7777777777777777,label:"16:9"},{ratio:2.3333333333333335,label:"21:9"}],L=0.03;for(let{ratio:X,label:Z}of J)if(Math.abs(H-X)/X<L)return Z;let Q=(X,Z)=>Z===0?X:Q(Z,X%Z),Y=Q($,W);return`${$/Y}:${W/Y}`}class M extends Error{code;clientCode;httpStatus;data;cause;static STATUS_MAP={BAD_REQUEST:400,UNAUTHORIZED:401,FORBIDDEN:403,NOT_FOUND:404,METHOD_NOT_SUPPORTED:405,TIMEOUT:408,CONFLICT:409,PRECONDITION_FAILED:412,PAYLOAD_TOO_LARGE:413,UNPROCESSABLE_CONTENT:422,TOO_MANY_REQUESTS:429,CLIENT_CLOSED_REQUEST:499,INTERNAL_SERVER_ERROR:500,NOT_IMPLEMENTED:501,BAD_GATEWAY:502,SERVICE_UNAVAILABLE:503,GATEWAY_TIMEOUT:504};constructor($){super($.message);if(this.name="BRPCError",this.code=$.code,this.clientCode=$.clientCode,this.httpStatus=M.STATUS_MAP[$.code],this.data=$.data,this.cause=$.cause,Error.captureStackTrace)Error.captureStackTrace(this,M)}toJSON(){return{name:this.name,code:this.code,clientCode:this.clientCode,message:this.message,data:this.data,httpStatus:this.httpStatus}}static badRequest($,W,H){return new M({code:"BAD_REQUEST",message:$,clientCode:W,data:H})}static unauthorized($="Unauthorized",W,H){return new M({code:"UNAUTHORIZED",message:$,clientCode:W,data:H})}static forbidden($="Forbidden",W,H){return new M({code:"FORBIDDEN",message:$,clientCode:W,data:H})}static notFound($="Not Found",W,H){return new M({code:"NOT_FOUND",message:$,clientCode:W,data:H})}static preconditionFailed($="Precondition failed",W,H){return new M({code:"NOT_FOUND",message:$,clientCode:W,data:H})}static conflict($,W,H){return new M({code:"CONFLICT",message:$,clientCode:W,data:H})}static unprocessableContent($,W,H){return new M({code:"UNPROCESSABLE_CONTENT",message:$,clientCode:W,data:H})}static tooManyRequests($="Too many requests",W,H){return new M({code:"TOO_MANY_REQUESTS",message:$,clientCode:W,data:H})}static internalServerError($="Internal Server Error",W,H){return new M({code:"INTERNAL_SERVER_ERROR",message:$,clientCode:W,data:H})}static timeout($="Request timeout",W,H){return new M({code:"TIMEOUT",message:$,clientCode:W,data:H})}}import P from"sharp";var w={xs:200,sm:400,md:800,lg:1200},V=1920;async function D($,W,H,J,L){try{let{data:Q,info:Y}=await P($,{limitInputPixels:1e8}).rotate().resize({width:W,height:W,fit:"inside",withoutEnlargement:!0}).webp({quality:H}).toBuffer({resolveWithObject:!0});return{buffer:Q,object:{name:J.replace(/\.[^/.]+$/,".webp"),resolvedType:"image",metadata:{type:"image/webp",size:Q.length,extension:".webp",width:Y.width,height:Y.height,aspectRatio:Y.width&&Y.height?Y.width/Y.height:1,aspectRatioStr:Y.width&&Y.height?G(Y.width,Y.height):"1:1",acl:L}}}}catch(Q){throw M.conflict(`Failed to optimize image: ${Q instanceof Error?Q.message:"Unknown error"}`)}}async function I($){if(!$)throw M.conflict("A file must be provided");let W,H="unknown.webp";if(typeof $==="string"){if(console.log("I'm going to fail here for file",$),!$.startsWith("data:"))throw console.log("I never got here"),M.conflict("Invalid base64 format");let[,J]=$.split(",");if(!J)throw M.conflict("Invalid base64 data");W=Buffer.from(J,"base64")}else{if(!x.isImage($.type))throw M.conflict("File must be an image");let J=await $.arrayBuffer();W=Buffer.from(J),H=$.name??H}return{buffer:W,name:H}}async function L0($,{size:W,quality:H,acl:J}={}){let L=await I($);return D(L.buffer,W??V,H??80,L.name,J??"public-read")}async function M0($,{name:W="unknown.webp",size:H,quality:J,acl:L}={}){if(!$?.length)throw M.conflict("A buffer must be provided");return D($,H??V,J??80,W,L??"public-read")}async function k($,{quality:W=80,acl:H="public-read"}={}){console.log("Going to normalizeImageInput");let J=await I($);console.log("Going to processSharpImage for original");let L=await D(J.buffer,V,W,J.name,H);console.log("Going to processSharpImage for variantsEntries");let Q=await Promise.all(Object.entries(w).map(async([Y,X])=>{let Z=await D(J.buffer,X,W,J.name,H);return[Y,Z]}));return{original:L,variants:Object.fromEntries(Q)}}import c from"sharp";import{randomUUID as b}from"crypto";import{extname as C}from"path";async function v($,W,H){if(!W)return{data:null,error:Error("File not found")};let J=$.replace(/^\/+|\/+$/g,""),L=C(W.name),Q=`${b()}${L}`,Y=`${J}/${Q}`,X=`./buckets/${J}/${Q}`;try{let Z=await Bun.write(X,W);return{data:{key:Y,file:W,bytesWritten:Z},error:null}}catch(Z){return{data:null,error:Error(`Failed to upload ${W.name} to local filesystem`)}}}async function g($,W,H){if(!W||W.length===0)return[];let J=W.map((Q)=>{let Y=H?.(Q)??Q.name;return v($,Q,Y)});return await Promise.all(J)}async function m($){let W=Bun.file(`./buckets/${$}`);if(!await W.exists())return null;return W}async function h($){let W=Bun.file(`./buckets/${$}`);if(!await W.exists())return!1;return await W.delete(),!0}var U={uploadOne:v,uploadMany:g,getOne:m,deleteOne:h};async function D0($){let W=`./cache/images/${$.key}_${$.width}_${$.quality}.webp`,H=await U.getOne(W);if(H){if(!x.isImage(H.type))return null;return H}let J=$.key,L=await U.getOne(J);if(!L)return null;if(!x.isImage(L.type))return null;let Q=await L.arrayBuffer(),Y=await c(Q).resize($.width,null,{withoutEnlargement:!0}).webp({quality:$.quality??75}).toBuffer();await Bun.write(W,Y);let X=Bun.file(W);if(!await X.exists())return null;return X}import u from"sharp";async function j0($){if(!$?.length)return null;try{let W=await u($).metadata(),H=W.width??0,J=W.height??0,L=W.height>0?H/J:1;return{type:`image/${W.format}`,size:W.size??0,extension:`.${W.format}`,width:H,height:J,aspectRatio:L,aspectRatioStr:G(H,J)}}catch(W){return console.warn("Failed to read image metadata:",W),null}}var R=process.env.AWS_FOLDER,B=R?`${R}/`:"";var{s3:y}=globalThis.Bun;import{extname as d}from"path";async function A($,W,H){let J="buffer"in W?W:{buffer:W,object:{name:W.name,resolvedType:O(W.type),metadata:{type:W.type,extension:d(W.name),size:W.size,acl:H?.acl??"public-read"}}};if("buffer"in W){if(!W.object?.name||!W.object?.metadata)throw M.badRequest("Complete metadata required when uploading buffer")}let L=$.length>1?`${$.replace(/^\/+|\/+$/g,"")}/`:"",Q=J.object.metadata.extension.startsWith(".")?J.object.metadata.extension:`.${J.object.metadata.extension}`,Y=J.object.name?J.object.name:`${crypto.randomUUID()}${Q}`,X=`${B}${L}${Y}`,Z=y.file(X),_=J?.object?.metadata?.acl??"public-read",K=_!=="public-read"&&_!=="public-read-write",E=await Z.write(J.buffer,{acl:_,type:J.object.metadata.type});return{uploadedBy:H?.uploadedBy??null,key:X,url:null,name:J.object.name,thumbnail:null,resolvedType:J.object.resolvedType,provider:"s3",isPrivate:K,metadata:{...J.object.metadata,size:E,acl:_},isActive:!0}}async function k0($,W,H={throwIf:"any"}){let J=await Promise.allSettled(W.map((Y)=>A($,Y,{acl:H?.acl,uploadedBy:H?.uploadedBy}))),L=[],Q=[];if(J.forEach((Y)=>{if(Y.status==="fulfilled"){if(L.push(Y.value),H?.externalKeys)H.externalKeys.push(Y.value.key)}else Q.push(Y.reason)}),H?.throwIf==="any"&&Q.length>0||H?.throwIf==="all"&&Q.length===W.length)throw M.internalServerError(`Upload failed: ${Q.length} of ${W.length}`);return{data:L,errors:Q.length?Q:void 0}}async function f($,W,H){let J=H?.baseId??crypto.randomUUID(),L=W.original.object.metadata.extension,Q=await A($,{...W.original,object:{...W.original.object,name:`${J}${L}`}},H),Y=await Promise.all(Object.entries(W.variants).map(async([X,Z])=>{if(!Z)return[X,null];let _=Z.object.metadata.extension,K=await A($,{...Z,object:{...Z.object,name:`${J}_${X}${_}`}},H);return[X,{key:K.key,url:K.url,name:K.name,metadata:{type:K.metadata?.type,size:K.metadata?.size,extension:K.metadata?.extension,width:K.metadata?.width,height:K.metadata?.height,aspectRatio:K.metadata?.aspectRatio,aspectRatioStr:K.metadata?.aspectRatioStr,resolution:K.metadata?.resolution,bitrate:K.metadata?.bitrate,codec:K.metadata?.codec,fps:K.metadata?.fps}}]}));return{original:Q,variants:Object.fromEntries(Y.filter(([,X])=>X!==null))}}async function v0($,W,H){if(Array.isArray(W))throw Error("File can't be an array, pass a single file");let J=await k(W,{quality:H?.quality,acl:H?.acl});return f($,J,{acl:H?.acl,uploadedBy:H?.uploadedBy})}var{s3:n}=globalThis.Bun;async function p($,W){if(!$||typeof $!=="string")throw M.badRequest("Key is required");let H=$.trim();if(!H||H.length===0)throw M.badRequest("Key must be a non-empty string");try{return await n.delete($),{key:$,deleted:!0,error:null}}catch(J){return{key:$,deleted:!1,error:J}}}async function P0($,W){return(await Promise.allSettled($.map((J)=>p(J,W)))).map((J,L)=>{if(J.status==="fulfilled")return J.value;return{key:$[L],deleted:!1,error:J.reason}})}var{s3:s}=globalThis.Bun;async function g0($,W={debug:!0}){try{return{exists:await s.exists($),error:null}}catch(H){if(W?.debug)console.error("There was an error checking for file existance",H);return{exists:null,error:H}}}export{A as uploadOne,k0 as uploadMany,f as uploadGeneratedVariants,M0 as optimizeImageBuffer,L0 as optimizeImage,O as mimeTypeToResolvedType,D0 as getOptimizedImage,r as getObjectUrl,j0 as getImageMetadata,a as getAspectRatioStringRound,G as getAspectRatioString,k as generateVariants,o as generateTestFile,v0 as generateAndUploadImage,x as fileTypePredicates,p as deleteOne,P0 as deleteMany,g0 as checkFileExistance};
+var U=($)=>$.startsWith("image/"),V=($)=>$.startsWith("video/"),q=($)=>$.startsWith("audio/"),A=($)=>$.startsWith("text/")||$.includes("pdf")||$.includes("word")||$.includes("sheet")||$.includes("presentation")||$.includes("opendocument")||$==="application/rtf",F=($)=>$.includes("zip")||$.includes("rar")||$.includes("tar")||$.includes("7z")||$.includes("gzip"),S=($)=>$==="application/javascript"||$==="application/json"||$==="text/html"||$==="text/css"||$==="application/xml"||$.includes("javascript"),N=($)=>$.startsWith("font/")||$.includes("font"),z=($)=>{if(!$)return"other";let W=$.toLowerCase();if(U(W))return"image";if(V(W))return"video";if(q(W))return"audio";if(A(W))return"document";if(F(W))return"archive";if(S(W))return"code";if(N(W))return"font";return"other"},D={isImage:U,isVideo:V,isAudio:q,isDocument:A,isArchive:F,isCode:S,isFont:N};function o(){let W=Buffer.from("Hello, this is a test file for S3 upload!","utf-8");return new File([W],"test.txt",{type:"text/plain"})}function x($,W){if(!$||$<1||!W||W<1)return"1:1";let j=(Q,J)=>J===0?Q:j(J,Q%J),H=j($,W);return`${$/H}:${W/H}`}function t($,W){if(!$||!W||$<1||W<1)return"1:1";let j=$/W,H=[{ratio:1,label:"1:1"},{ratio:0.8,label:"4:5"},{ratio:0.75,label:"3:4"},{ratio:0.6666666666666666,label:"2:3"},{ratio:0.5625,label:"9:16"},{ratio:1.5,label:"3:2"},{ratio:1.3333333333333333,label:"4:3"},{ratio:1.7777777777777777,label:"16:9"},{ratio:2.3333333333333335,label:"21:9"}],Q=0.03;for(let{ratio:X,label:K}of H)if(Math.abs(j-X)/X<Q)return K;let J=(X,K)=>K===0?X:J(K,X%K),Y=J($,W);return`${$/Y}:${W/Y}`}class L extends Error{code;clientCode;httpStatus;data;cause;static STATUS_MAP={BAD_REQUEST:400,UNAUTHORIZED:401,FORBIDDEN:403,NOT_FOUND:404,METHOD_NOT_SUPPORTED:405,TIMEOUT:408,CONFLICT:409,PRECONDITION_FAILED:412,PAYLOAD_TOO_LARGE:413,UNPROCESSABLE_CONTENT:422,TOO_MANY_REQUESTS:429,CLIENT_CLOSED_REQUEST:499,INTERNAL_SERVER_ERROR:500,NOT_IMPLEMENTED:501,BAD_GATEWAY:502,SERVICE_UNAVAILABLE:503,GATEWAY_TIMEOUT:504};constructor($){super($.message);if(this.name="BRPCError",this.code=$.code,this.clientCode=$.clientCode,this.httpStatus=L.STATUS_MAP[$.code],this.data=$.data,this.cause=$.cause,Error.captureStackTrace)Error.captureStackTrace(this,L)}toJSON(){return{name:this.name,code:this.code,clientCode:this.clientCode,message:this.message,data:this.data,httpStatus:this.httpStatus}}static badRequest($,W,j){return new L({code:"BAD_REQUEST",message:$,clientCode:W,data:j})}static unauthorized($="Unauthorized",W,j){return new L({code:"UNAUTHORIZED",message:$,clientCode:W,data:j})}static forbidden($="Forbidden",W,j){return new L({code:"FORBIDDEN",message:$,clientCode:W,data:j})}static notFound($="Not Found",W,j){return new L({code:"NOT_FOUND",message:$,clientCode:W,data:j})}static preconditionFailed($="Precondition failed",W,j){return new L({code:"NOT_FOUND",message:$,clientCode:W,data:j})}static conflict($,W,j){return new L({code:"CONFLICT",message:$,clientCode:W,data:j})}static unprocessableContent($,W,j){return new L({code:"UNPROCESSABLE_CONTENT",message:$,clientCode:W,data:j})}static tooManyRequests($="Too many requests",W,j){return new L({code:"TOO_MANY_REQUESTS",message:$,clientCode:W,data:j})}static internalServerError($="Internal Server Error",W,j){return new L({code:"INTERNAL_SERVER_ERROR",message:$,clientCode:W,data:j})}static timeout($="Request timeout",W,j){return new L({code:"TIMEOUT",message:$,clientCode:W,data:j})}}import B from"sharp";var T={xs:200,sm:400,md:800,lg:1200,xl:1920},_=1920;async function G($,W,j,H,Q){try{let{data:J,info:Y}=await B($,{limitInputPixels:1e8}).rotate().resize({width:W,height:W,fit:"inside",withoutEnlargement:!0}).webp({quality:j}).toBuffer({resolveWithObject:!0});return{buffer:J,object:{name:H.replace(/\.[^/.]+$/,".webp"),resolvedType:"image",metadata:{type:"image/webp",size:J.length,extension:".webp",width:Y.width,height:Y.height,aspectRatio:Y.width&&Y.height?Y.width/Y.height:1,aspectRatioStr:Y.width&&Y.height?x(Y.width,Y.height):"1:1",acl:Q}}}}catch(J){throw L.conflict(`Failed to optimize image: ${J instanceof Error?J.message:"Unknown error"}`)}}async function w($){if(!$)throw L.conflict("A file must be provided");let W,j="unknown.webp";if(typeof $==="string"){if(console.log("I'm going to fail here for file",$),!$.startsWith("data:"))throw console.log("I never got here"),L.conflict("Invalid base64 format");let[,H]=$.split(",");if(!H)throw L.conflict("Invalid base64 data");W=Buffer.from(H,"base64")}else{if(!D.isImage($.type))throw L.conflict("File must be an image");let H=await $.arrayBuffer();W=Buffer.from(H),j=$.name??j}return{buffer:W,name:j}}async function Q0($,{size:W,quality:j,acl:H}={}){let Q=await w($);return G(Q.buffer,W??_,j??80,Q.name,H??"public-read")}async function Y0($,{name:W="unknown.webp",size:j,quality:H,acl:Q}={}){if(!$?.length)throw L.conflict("A buffer must be provided");return G($,j??_,H??80,W,Q??"public-read")}async function I($,{quality:W=80,acl:j="public-read"}={}){let H=await w($),Q=await Promise.all(Object.entries(T).map(async([J,Y])=>{let X=await G(H.buffer,Y,W,H.name,j);return[J,X]}));return{variants:Object.fromEntries(Q)}}import m from"sharp";import{randomUUID as P}from"crypto";import{extname as C}from"path";async function k($,W,j){if(!W)return{data:null,error:Error("File not found")};let H=$.replace(/^\/+|\/+$/g,""),Q=C(W.name),J=`${P()}${Q}`,Y=`${H}/${J}`,X=`./buckets/${H}/${J}`;try{let K=await Bun.write(X,W);return{data:{key:Y,file:W,bytesWritten:K},error:null}}catch(K){return{data:null,error:Error(`Failed to upload ${W.name} to local filesystem`)}}}async function g($,W,j){if(!W||W.length===0)return[];let H=W.map((J)=>{let Y=j?.(J)??J.name;return k($,J,Y)});return await Promise.all(H)}async function c($){let W=Bun.file(`./buckets/${$}`);if(!await W.exists())return null;return W}async function h($){let W=Bun.file(`./buckets/${$}`);if(!await W.exists())return!1;return await W.delete(),!0}var O={uploadOne:k,uploadMany:g,getOne:c,deleteOne:h};async function _0($){let W=`./cache/images/${$.key}_${$.width}_${$.quality}.webp`,j=await O.getOne(W);if(j){if(!D.isImage(j.type))return null;return j}let H=$.key,Q=await O.getOne(H);if(!Q)return null;if(!D.isImage(Q.type))return null;let J=await Q.arrayBuffer(),Y=await m(J).resize($.width,null,{withoutEnlargement:!0}).webp({quality:$.quality??75}).toBuffer();await Bun.write(W,Y);let X=Bun.file(W);if(!await X.exists())return null;return X}import u from"sharp";async function V0($){if(!$?.length)return null;try{let W=await u($).metadata(),j=W.width??0,H=W.height??0,Q=W.height>0?j/H:1;return{type:`image/${W.format}`,size:W.size??0,extension:`.${W.format}`,width:j,height:H,aspectRatio:Q,aspectRatioStr:x(j,H)}}catch(W){return console.warn("Failed to read image metadata:",W),null}}var v=process.env.AWS_FOLDER,b=v?`${v}/`:"";var{s3:y}=globalThis.Bun;import{extname as d}from"path";async function R($,W,j){let H="buffer"in W?W:{buffer:W,object:{name:W.name,resolvedType:z(W.type),metadata:{type:W.type,extension:d(W.name),size:W.size,acl:j?.acl??"public-read"}}};if("buffer"in W){if(!W.object?.name||!W.object?.metadata)throw L.badRequest("Complete metadata required when uploading buffer")}let Q=$.length>1?`${$.replace(/^\/+|\/+$/g,"")}/`:"",J=H.object.metadata.extension.startsWith(".")?H.object.metadata.extension:`.${H.object.metadata.extension}`,Y=H.object.name?H.object.name:`${crypto.randomUUID()}${J}`,X=`${b}${Q}${Y}`,K=y.file(X),M=H?.object?.metadata?.acl??"public-read",Z=M!=="public-read"&&M!=="public-read-write",E=await K.write(H.buffer,{acl:M,type:H.object.metadata.type});return{uploadedBy:j?.uploadedBy??null,key:X,url:null,name:H.object.name,resolvedType:H.object.resolvedType,provider:"s3",isPrivate:Z,metadata:{...H.object.metadata,size:E,acl:M},isActive:!0}}async function I0($,W,j={throwIf:"any"}){let H=await Promise.allSettled(W.map((Y)=>R($,Y,{acl:j?.acl,uploadedBy:j?.uploadedBy}))),Q=[],J=[];if(H.forEach((Y)=>{if(Y.status==="fulfilled"){if(Q.push(Y.value),j?.externalKeys)j.externalKeys.push(Y.value.key)}else J.push(Y.reason)}),j?.throwIf==="any"&&J.length>0||j?.throwIf==="all"&&J.length===W.length)throw L.internalServerError(`Upload failed: ${J.length} of ${W.length}`);return{data:Q,errors:J.length?J:void 0}}async function f($,W,j){let H=j?.baseId??crypto.randomUUID(),Q=Object.values(W.variants).find(Boolean),J=await Promise.all(Object.entries(W.variants).map(async([X,K])=>{if(!K)return[X,null];let M=K.object.metadata.extension,Z=await R($,{...K,object:{...K.object,name:`${H}_${X}${M}`}},j);return[X,{key:Z.key,url:Z.url,name:Z.name,metadata:{type:Z.metadata?.type,extension:Z.metadata?.extension,size:Z.metadata?.size,hash:null,width:Z.metadata?.width,height:Z.metadata?.height,aspectRatio:Z.metadata?.aspectRatio,aspectRatioStr:Z.metadata?.aspectRatioStr,resolution:Z.metadata?.resolution,bitrate:Z.metadata?.bitrate,codec:Z.metadata?.codec,fps:Z.metadata?.fps}}]})),Y=(j?.acl??"public-read")!=="public-read"&&(j?.acl??"public-read")!=="public-read-write";return{shared:{name:Q.object.name,resolvedType:Q.object.resolvedType,provider:"s3",isPrivate:Y,uploadedBy:j?.uploadedBy??null},variants:Object.fromEntries(J.filter(([,X])=>X!==null))}}async function k0($,W,j){if(Array.isArray(W))throw Error("File can't be an array, pass a single file");let H=await I(W,{quality:j?.quality,acl:j?.acl});return f($,H,{acl:j?.acl,uploadedBy:j?.uploadedBy})}var{s3:n}=globalThis.Bun;async function p($,W){if(!$||typeof $!=="string")throw L.badRequest("Key is required");let j=$.trim();if(!j||j.length===0)throw L.badRequest("Key must be a non-empty string");try{return await n.delete($),{key:$,deleted:!0,error:null}}catch(H){return{key:$,deleted:!1,error:H}}}async function E0($,W){return(await Promise.allSettled($.map((H)=>p(H,W)))).map((H,Q)=>{if(H.status==="fulfilled")return H.value;return{key:$[Q],deleted:!1,error:H.reason}})}var{s3:s}=globalThis.Bun;async function C0($,W={debug:!0}){try{return{exists:await s.exists($),error:null}}catch(j){if(W?.debug)console.error("There was an error checking for file existance",j);return{exists:null,error:j}}}export{R as uploadOne,I0 as uploadMany,f as uploadGeneratedVariants,Y0 as optimizeImageBuffer,Q0 as optimizeImage,z as mimeTypeToResolvedType,_0 as getOptimizedImage,V0 as getImageMetadata,t as getAspectRatioStringRound,x as getAspectRatioString,I as generateVariants,o as generateTestFile,k0 as generateAndUploadImage,D as fileTypePredicates,p as deleteOne,E0 as deleteMany,C0 as checkFileExistance};
 
-//# debugId=5E1C8B325A3FF69364756E2164756E21
+//# debugId=0E189ECC2AA2E54464756E2164756E21

package/dist/storage/s3/types.d.ts

@@ -1,5 +1,5 @@
 import type { ImageVariantName } from "../images";
-import type { InsertStorageObjet } from "../types";
+import type { ResolvedFileType, StorageObjectVariant, StorageProvider } from "../types";
 type DeleteOneNiceResult = {
     key: string;
     deleted: true;
@@ -12,7 +12,13 @@ type DeleteOneBadResult = {
 };
 type DeleteOneResult = DeleteOneNiceResult | DeleteOneBadResult;
 export type UploadedImageVariants = {
-    original: InsertStorageObjet;
-    variants: Partial<Record<ImageVariantName, InsertStorageObjet>>;
+    shared: {
+        name: string;
+        resolvedType: ResolvedFileType;
+        provider: StorageProvider;
+        isPrivate: boolean;
+        uploadedBy: string | null;
+    };
+    variants: Partial<Record<ImageVariantName, StorageObjectVariant>>;
 };
 export type { DeleteOneResult };

package/dist/storage/s3/upload.d.ts

@@ -1,4 +1,4 @@
-import type { Acl, InsertStorageObjet, UploadableObjectBuffer } from "../types";
+import type { Acl, RawUploadResult, UploadableObjectBuffer } from "../types";
 import { type BunFile } from "bun";
 import { type GeneratedImageVariants } from "../images";
 import type { UploadedImageVariants } from "./types";
@@ -32,7 +32,7 @@ declare function uploadOne(path: string, file: File | UploadableObjectBuffer, op
     acl?: Acl;
     externalReference?: string;
     uploadedBy?: string;
-}): Promise<InsertStorageObjet>;
+}): Promise<RawUploadResult>;
 export { uploadOne };
 type UploadManyOptions = {
     acl?: Acl;
@@ -41,7 +41,7 @@ type UploadManyOptions = {
     externalKeys?: string[];
 };
 type UploadManyResult = {
-    data: InsertStorageObjet[];
+    data: RawUploadResult[];
     errors?: any[];
 };
 export declare function uploadMany(path: string, files: UploadableObjectBuffer[], opts?: UploadManyOptions): Promise<UploadManyResult>;

package/dist/storage/types.d.ts

@@ -37,7 +37,7 @@ type StorageObjectMetadata = {
 };
 type StorageObjectVariantMetadata = {
     /**
-     * Mime type
+     * Mime type — e.g. "image/webp", "video/mp4". Per-variant because formats can differ.
      */
     type: string;
     /**
@@ -45,9 +45,13 @@ type StorageObjectVariantMetadata = {
      */
     size: number;
     /**
-     * File extension
+     * File extension — e.g. ".webp", ".mp4". Per-variant for the same reason as type.
      */
     extension: string;
+    /**
+     * Integrity checksum — reserved for future use, not yet populated
+     */
+    hash?: string | null;
     width?: number;
     height?: number;
     aspectRatio?: number;
@@ -68,23 +72,16 @@ type StorageObject = {
     createdAt: string;
     updatedAt: string;
     uploadedBy: string | null;
-    /**
-     * Key for S3 or Local storage files: "uploads/user123/file.jpg"
-     * Will be null for external files
-     */
-    key: string | null;
-    /**
-     * Full URL for external files: "https://unsplash.com/photo.jpg"
-     */
-    url: string | null;
     name: string | null;
-    thumbnail: string | null;
-    resolvedType: ResolvedFileType;
+    type: ResolvedFileType;
     provider: StorageProvider;
     isPrivate: boolean | null;
-    metadata: StorageObjectMetadata | null;
     isActive: boolean;
+    thumbnail: string | null;
+    alt: string | null;
+    colorPalette: string[] | null;
     referenceCount: number;
+    variants: Partial<Record<string, StorageObjectVariant>>;
 };
 type StorageObjectVariant = {
     key: string | null;
@@ -92,8 +89,17 @@ type StorageObjectVariant = {
     name: string | null;
     metadata: StorageObjectVariantMetadata;
 };
-type InsertStorageObjet = Omit<StorageObject, "id" | "createdAt" | "updatedAt" | "referenceCount"> & {
+type InsertStorageObject = Omit<StorageObject, "id" | "createdAt" | "updatedAt" | "referenceCount">;
+type RawUploadResult = {
+    uploadedBy: string | null;
     key: string;
+    url: string | null;
+    name: string | null;
+    resolvedType: ResolvedFileType;
+    provider: StorageProvider;
+    isPrivate: boolean | null;
+    metadata: StorageObjectMetadata | null;
+    isActive: boolean;
 };
 export type UploadableObjectBuffer = {
     buffer: Buffer | File;
@@ -103,4 +109,4 @@ export type UploadableObjectBuffer = {
         metadata: StorageObjectMetadata;
     };
 };
-export type { ResolvedFileType, StorageObject, StorageObjectMetadata, StorageObjectVariant, StorageObjectVariantMetadata, Acl, StorageProvider, InsertStorageObjet, };
+export type { ResolvedFileType, StorageObject, StorageObjectMetadata, StorageObjectVariant, StorageObjectVariantMetadata, Acl, StorageProvider, InsertStorageObject, RawUploadResult, };

package/dist/storage/utils/files.d.ts

@@ -1,4 +1,4 @@
-import type { ResolvedFileType, StorageObject } from "../types";
+import type { ResolvedFileType } from "../types";
 /**
  * Maps MIME types to file categories
  * @param mimeType - The MIME type string
@@ -18,10 +18,4 @@ declare const fileTypePredicates: {
  * Generates a text.txt file so you can test file uploading is working
  */
 declare function generateTestFile(): File;
-/**
- * @returns url of the file
- */
-declare function getObjectUrl(storageObject: StorageObject, options?: {
-    bucket?: string;
-}): string;
-export { mimeTypeToResolvedType, fileTypePredicates, getObjectUrl, generateTestFile, };
+export { mimeTypeToResolvedType, fileTypePredicates, generateTestFile, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mateosuarezdev/brpc",
-  "version": "1.0.71",
+  "version": "1.0.74",
   "description": "A Type-Safe, Flexible Web application framework for Bun",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -45,9 +45,9 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build": "yarn clean && bun run build.ts && tsc --emitDeclarationOnly",
     "typecheck": "tsc --noEmit",
     "clean": "rimraf dist",
+    "build": "yarn clean && bun run build.ts && tsc --emitDeclarationOnly",
     "prepublish": "yarn typecheck && yarn build",
     "rel": "npm publish --access public",
     "rel:patch": "yarn run prepublish && yarn version patch && npm publish --access public",
@@ -125,7 +125,7 @@
     "node-cron": "^3.0.0",
     "rimraf": "^6.0.1",
     "sharp": "^0.34.4",
-    "surrealdb": "^2.0.0",
+    "surrealdb": "^2.0.3",
     "typescript": "^5.9.3",
     "zod": "^3.23.8"
   },