@kedaruma/revlm-client 1.0.9 → 1.0.11

package/dist/index.d.mts

@@ -1,8 +1,6 @@
 import { User as User$1 } from '@kedaruma/revlm-shared/models/user-types';
-import { Timestamp, Long } from 'bson';
 import * as bson from 'bson';
-export { bson as BSON };
-export { ObjectId as ObjectID, ObjectId } from 'bson';
+import { Timestamp, Long } from 'bson';
 
 type RevlmErrorResponse = {
     ok: false;
@@ -175,6 +173,7 @@ type RevlmOptions = {
     provisionalAuthSecretMaster?: string;
     provisionalAuthDomain?: string;
     autoSetToken?: boolean;
+    autoRefreshOn401?: boolean;
 };
 type RevlmResponse<T = any> = {
     ok: boolean;
@@ -193,6 +192,7 @@ declare class Revlm {
     private provisionalAuthSecretMaster;
     private provisionalAuthDomain;
     private autoSetToken;
+    private autoRefreshOn401;
     constructor(baseUrl: string, opts?: RevlmOptions);
     setToken(token: string): void;
     getToken(): string | undefined;
@@ -203,6 +203,8 @@ declare class Revlm {
     private makeHeaders;
     private parseResponse;
     private request;
+    private shouldSkipAuthRetry;
+    private requestWithRetry;
     login(authId: string, password: string): Promise<LoginResponse>;
     provisionalLogin(authId: string): Promise<ProvisionalLoginResponse>;
     registerUser(user: UserInput, password: string): Promise<RevlmResponse<any>>;
@@ -256,4 +258,10 @@ declare class App {
     deleteUser(user: User): Promise<void>;
 }
 
-export { type AggregatePipelineStage, App, type BaseChangeEvent, type ChangeEvent, type ChangeEventId, type CountOptions, Credentials, type DeleteEvent, type DeleteResult, type DeleteUserResponse, type DeleteUserSuccess, type Document, type DocumentKey, type DocumentNamespace, type DropDatabaseEvent, type DropEvent, type Filter, type FindOneAndModifyOptions, type FindOneOptions, type FindOptions, type InsertEvent, type InsertManyResult, type InsertOneResult, type InvalidateEvent, type LoginResponse, type LoginSuccess, MdbCollection, MongoDBService, type NewDocument, type OperationType, type ProvisionalLoginResponse, type ProvisionalLoginSuccess, type RegisterUserResponse, type RegisterUserSuccess, type RenameEvent, type ReplaceEvent, Revlm, RevlmDBDatabase, type RevlmErrorResponse, type RevlmOptions, type RevlmResponse, type Update, type UpdateDescription, type UpdateEvent, type UpdateOptions, type UpdateResult, User, type WatchOptionsFilter, type WatchOptionsIds };
+declare const ObjectId: typeof bson.ObjectId;
+declare const ObjectID: typeof bson.ObjectId;
+declare const BSON: typeof bson & {
+    ObjectID: typeof bson.ObjectId;
+};
+
+export { type AggregatePipelineStage, App, BSON, type BaseChangeEvent, type ChangeEvent, type ChangeEventId, type CountOptions, Credentials, type DeleteEvent, type DeleteResult, type DeleteUserResponse, type DeleteUserSuccess, type Document, type DocumentKey, type DocumentNamespace, type DropDatabaseEvent, type DropEvent, type Filter, type FindOneAndModifyOptions, type FindOneOptions, type FindOptions, type InsertEvent, type InsertManyResult, type InsertOneResult, type InvalidateEvent, type LoginResponse, type LoginSuccess, MdbCollection, MongoDBService, type NewDocument, ObjectID, ObjectId, type OperationType, type ProvisionalLoginResponse, type ProvisionalLoginSuccess, type RegisterUserResponse, type RegisterUserSuccess, type RenameEvent, type ReplaceEvent, Revlm, RevlmDBDatabase, type RevlmErrorResponse, type RevlmOptions, type RevlmResponse, type Update, type UpdateDescription, type UpdateEvent, type UpdateOptions, type UpdateResult, User, type WatchOptionsFilter, type WatchOptionsIds };

package/dist/index.d.ts

@@ -1,8 +1,6 @@
 import { User as User$1 } from '@kedaruma/revlm-shared/models/user-types';
-import { Timestamp, Long } from 'bson';
 import * as bson from 'bson';
-export { bson as BSON };
-export { ObjectId as ObjectID, ObjectId } from 'bson';
+import { Timestamp, Long } from 'bson';
 
 type RevlmErrorResponse = {
     ok: false;
@@ -175,6 +173,7 @@ type RevlmOptions = {
     provisionalAuthSecretMaster?: string;
     provisionalAuthDomain?: string;
     autoSetToken?: boolean;
+    autoRefreshOn401?: boolean;
 };
 type RevlmResponse<T = any> = {
     ok: boolean;
@@ -193,6 +192,7 @@ declare class Revlm {
     private provisionalAuthSecretMaster;
     private provisionalAuthDomain;
     private autoSetToken;
+    private autoRefreshOn401;
     constructor(baseUrl: string, opts?: RevlmOptions);
     setToken(token: string): void;
     getToken(): string | undefined;
@@ -203,6 +203,8 @@ declare class Revlm {
     private makeHeaders;
     private parseResponse;
     private request;
+    private shouldSkipAuthRetry;
+    private requestWithRetry;
     login(authId: string, password: string): Promise<LoginResponse>;
     provisionalLogin(authId: string): Promise<ProvisionalLoginResponse>;
     registerUser(user: UserInput, password: string): Promise<RevlmResponse<any>>;
@@ -256,4 +258,10 @@ declare class App {
     deleteUser(user: User): Promise<void>;
 }
 
-export { type AggregatePipelineStage, App, type BaseChangeEvent, type ChangeEvent, type ChangeEventId, type CountOptions, Credentials, type DeleteEvent, type DeleteResult, type DeleteUserResponse, type DeleteUserSuccess, type Document, type DocumentKey, type DocumentNamespace, type DropDatabaseEvent, type DropEvent, type Filter, type FindOneAndModifyOptions, type FindOneOptions, type FindOptions, type InsertEvent, type InsertManyResult, type InsertOneResult, type InvalidateEvent, type LoginResponse, type LoginSuccess, MdbCollection, MongoDBService, type NewDocument, type OperationType, type ProvisionalLoginResponse, type ProvisionalLoginSuccess, type RegisterUserResponse, type RegisterUserSuccess, type RenameEvent, type ReplaceEvent, Revlm, RevlmDBDatabase, type RevlmErrorResponse, type RevlmOptions, type RevlmResponse, type Update, type UpdateDescription, type UpdateEvent, type UpdateOptions, type UpdateResult, User, type WatchOptionsFilter, type WatchOptionsIds };
+declare const ObjectId: typeof bson.ObjectId;
+declare const ObjectID: typeof bson.ObjectId;
+declare const BSON: typeof bson & {
+    ObjectID: typeof bson.ObjectId;
+};
+
+export { type AggregatePipelineStage, App, BSON, type BaseChangeEvent, type ChangeEvent, type ChangeEventId, type CountOptions, Credentials, type DeleteEvent, type DeleteResult, type DeleteUserResponse, type DeleteUserSuccess, type Document, type DocumentKey, type DocumentNamespace, type DropDatabaseEvent, type DropEvent, type Filter, type FindOneAndModifyOptions, type FindOneOptions, type FindOptions, type InsertEvent, type InsertManyResult, type InsertOneResult, type InvalidateEvent, type LoginResponse, type LoginSuccess, MdbCollection, MongoDBService, type NewDocument, ObjectID, ObjectId, type OperationType, type ProvisionalLoginResponse, type ProvisionalLoginSuccess, type RegisterUserResponse, type RegisterUserSuccess, type RenameEvent, type ReplaceEvent, Revlm, RevlmDBDatabase, type RevlmErrorResponse, type RevlmOptions, type RevlmResponse, type Update, type UpdateDescription, type UpdateEvent, type UpdateOptions, type UpdateResult, User, type WatchOptionsFilter, type WatchOptionsIds };

package/dist/index.js

@@ -35,8 +35,8 @@ __export(index_exports, {
   Credentials: () => Credentials,
   MdbCollection: () => MdbCollection,
   MongoDBService: () => MongoDBService,
-  ObjectID: () => import_bson2.ObjectId,
-  ObjectId: () => import_bson2.ObjectId,
+  ObjectID: () => ObjectID,
+  ObjectId: () => ObjectId2,
   Revlm: () => Revlm,
   RevlmDBDatabase: () => RevlmDBDatabase,
   User: () => User
@@ -155,6 +155,7 @@ var Revlm = class {
   provisionalAuthSecretMaster;
   provisionalAuthDomain;
   autoSetToken;
+  autoRefreshOn401;
   constructor(baseUrl, opts = {}) {
     if (!baseUrl) throw new Error("baseUrl is required");
     this.baseUrl = baseUrl.replace(/\/$/, "");
@@ -164,6 +165,7 @@ var Revlm = class {
     this.provisionalAuthSecretMaster = opts.provisionalAuthSecretMaster || "";
     this.provisionalAuthDomain = opts.provisionalAuthDomain || "";
     this.autoSetToken = opts.autoSetToken ?? true;
+    this.autoRefreshOn401 = opts.autoRefreshOn401 || false;
     if (!this.fetchImpl) {
       throw new Error("No fetch implementation available. Provide fetchImpl in options or run in Node 18+ with global fetch.");
     }
@@ -185,7 +187,7 @@ var Revlm = class {
   // On success, if autoSetToken is true and res.token is set, update the client token.
   async refreshToken() {
     if (!this._token) return { ok: false, error: "No token set" };
-    const res = await this.request("/refresh-token", "POST");
+    const res = await this.requestWithRetry("/refresh-token", "POST", void 0, { allowAuthRetry: false, retrying: false });
     if (this.autoSetToken && res && res.ok && res.token) {
       this.setToken(res.token);
     }
@@ -230,6 +232,14 @@ var Revlm = class {
     }
   }
   async request(path, method = "POST", body) {
+    return this.requestWithRetry(path, method, body, { allowAuthRetry: this.autoRefreshOn401, retrying: false });
+  }
+  shouldSkipAuthRetry(path) {
+    const pathname = path.startsWith("http") ? new URL(path).pathname : path;
+    return pathname.includes("/login") || pathname.includes("/provisional-login") || pathname.includes("/refresh-token") || pathname.includes("/verify-token");
+  }
+  async requestWithRetry(path, method = "POST", body, opts = { allowAuthRetry: false, retrying: false }) {
+    const { allowAuthRetry, retrying } = opts;
     const url = path.startsWith("http") ? path : `${this.baseUrl}${path.startsWith("/") ? "" : "/"}${path}`;
     const hasBody = body !== void 0;
     const headers = this.makeHeaders(hasBody);
@@ -249,6 +259,12 @@ var Revlm = class {
       if (out && out.ok === false && !out.error) {
         out.error = parsed?.reason || parsed?.message || "Unknown error";
       }
+      if (allowAuthRetry && !retrying && res.status === 401 && !this.shouldSkipAuthRetry(path)) {
+        const refreshRes = await this.refreshToken();
+        if (refreshRes && refreshRes.ok && refreshRes.token) {
+          return this.requestWithRetry(path, method, body, { allowAuthRetry: false, retrying: true });
+        }
+      }
       return out;
     } catch (err) {
       return { ok: false, error: err?.message || String(err) };
@@ -404,9 +420,11 @@ var App = class {
   }
 };
 
-// src/index.ts
-var import_bson2 = require("bson");
-var BSON = __toESM(require("bson"));
+// src/bsonCompat.ts
+var bson = __toESM(require("bson"));
+var ObjectId2 = bson.ObjectId;
+var ObjectID = bson.ObjectId;
+var BSON = Object.assign({}, bson, { ObjectID: bson.ObjectId });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   App,

package/dist/index.mjs

@@ -110,6 +110,7 @@ var Revlm = class {
   provisionalAuthSecretMaster;
   provisionalAuthDomain;
   autoSetToken;
+  autoRefreshOn401;
   constructor(baseUrl, opts = {}) {
     if (!baseUrl) throw new Error("baseUrl is required");
     this.baseUrl = baseUrl.replace(/\/$/, "");
@@ -119,6 +120,7 @@ var Revlm = class {
     this.provisionalAuthSecretMaster = opts.provisionalAuthSecretMaster || "";
     this.provisionalAuthDomain = opts.provisionalAuthDomain || "";
     this.autoSetToken = opts.autoSetToken ?? true;
+    this.autoRefreshOn401 = opts.autoRefreshOn401 || false;
     if (!this.fetchImpl) {
       throw new Error("No fetch implementation available. Provide fetchImpl in options or run in Node 18+ with global fetch.");
     }
@@ -140,7 +142,7 @@ var Revlm = class {
   // On success, if autoSetToken is true and res.token is set, update the client token.
   async refreshToken() {
     if (!this._token) return { ok: false, error: "No token set" };
-    const res = await this.request("/refresh-token", "POST");
+    const res = await this.requestWithRetry("/refresh-token", "POST", void 0, { allowAuthRetry: false, retrying: false });
     if (this.autoSetToken && res && res.ok && res.token) {
       this.setToken(res.token);
     }
@@ -185,6 +187,14 @@ var Revlm = class {
     }
   }
   async request(path, method = "POST", body) {
+    return this.requestWithRetry(path, method, body, { allowAuthRetry: this.autoRefreshOn401, retrying: false });
+  }
+  shouldSkipAuthRetry(path) {
+    const pathname = path.startsWith("http") ? new URL(path).pathname : path;
+    return pathname.includes("/login") || pathname.includes("/provisional-login") || pathname.includes("/refresh-token") || pathname.includes("/verify-token");
+  }
+  async requestWithRetry(path, method = "POST", body, opts = { allowAuthRetry: false, retrying: false }) {
+    const { allowAuthRetry, retrying } = opts;
     const url = path.startsWith("http") ? path : `${this.baseUrl}${path.startsWith("/") ? "" : "/"}${path}`;
     const hasBody = body !== void 0;
     const headers = this.makeHeaders(hasBody);
@@ -204,6 +214,12 @@ var Revlm = class {
       if (out && out.ok === false && !out.error) {
         out.error = parsed?.reason || parsed?.message || "Unknown error";
       }
+      if (allowAuthRetry && !retrying && res.status === 401 && !this.shouldSkipAuthRetry(path)) {
+        const refreshRes = await this.refreshToken();
+        if (refreshRes && refreshRes.ok && refreshRes.token) {
+          return this.requestWithRetry(path, method, body, { allowAuthRetry: false, retrying: true });
+        }
+      }
       return out;
     } catch (err) {
       return { ok: false, error: err?.message || String(err) };
@@ -359,17 +375,19 @@ var App = class {
   }
 };
 
-// src/index.ts
-import { ObjectId, ObjectId as ObjectId2 } from "bson";
-import * as BSON from "bson";
+// src/bsonCompat.ts
+import * as bson from "bson";
+var ObjectId2 = bson.ObjectId;
+var ObjectID = bson.ObjectId;
+var BSON = Object.assign({}, bson, { ObjectID: bson.ObjectId });
 export {
   App,
   BSON,
   Credentials,
   MdbCollection,
   MongoDBService,
-  ObjectId2 as ObjectID,
-  ObjectId,
+  ObjectID,
+  ObjectId2 as ObjectId,
   Revlm,
   RevlmDBDatabase,
   User

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kedaruma/revlm-client",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "private": false,
   "description": "TypeScript client SDK for talking to the Revlm server replacement for MongoDB Realm.",
   "keywords": [