@formo/analytics 1.28.2 → 1.28.3

package/dist/cjs/src/FormoAnalytics.d.ts

@@ -45,6 +45,8 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * When true, EIP-1193 provider wrapping is skipped
      */
     private isWagmiMode;
+    /** Instance-level flag so multiple SDK instances don't interfere. */
+    private crossSubdomainCookies;
     config: Config;
     currentChainId?: ChainID;
     currentAddress?: Address;

package/dist/cjs/src/FormoAnalytics.js

@@ -60,6 +60,7 @@ exports.FormoAnalytics = void 0;
 var mipd_1 = require("mipd");
 var constants_1 = require("./constants");
 var storage_1 = require("./storage");
+var cookiePolicy_1 = require("./storage/cookiePolicy");
 var event_1 = require("./event");
 var queue_1 = require("./queue");
 var logger_1 = require("./logger");
@@ -84,7 +85,7 @@ var PROVIDER_SWITCH_REASONS = {
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
-        var _a, _b;
+        var _a, _b, _c;
         this.writeKey = writeKey;
         this.options = options;
         // Per-chain namespace state — isolates EVM and Solana connection state
@@ -123,6 +124,9 @@ var FormoAnalytics = /** @class */ (function () {
         this.options = options;
         // Check if Wagmi mode is enabled
         this.isWagmiMode = !!options.wagmi;
+        this.crossSubdomainCookies = (_a = options.crossSubdomainCookies) !== null && _a !== void 0 ? _a : true;
+        // Normalize so downstream consumers (EventFactory) read the resolved value.
+        options.crossSubdomainCookies = this.crossSubdomainCookies;
         this.session = new session_1.FormoAnalyticsSession();
         this.currentUserId =
             (0, storage_1.cookie)().get(constants_1.SESSION_USER_ID_KEY) || undefined;
@@ -137,8 +141,8 @@ var FormoAnalytics = /** @class */ (function () {
         this.isAutocaptureEnabled = this.isAutocaptureEnabled.bind(this);
         // Initialize logger with configuration from options
         logger_1.Logger.init({
-            enabled: ((_a = options.logger) === null || _a === void 0 ? void 0 : _a.enabled) || false,
-            enabledLevels: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.levels) || [],
+            enabled: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.enabled) || false,
+            enabledLevels: ((_c = options.logger) === null || _c === void 0 ? void 0 : _c.levels) || [],
         });
         this.eventManager = new event_1.EventManager(new queue_1.EventQueue(this.config.writeKey, {
             apiHost: options.apiHost || constants_1.EVENTS_API_HOST,
@@ -508,7 +512,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, providerDetail, provider, address_2, validAddress_1, err_1, address, providerName, userId, rdns, validAddress, isAlreadyIdentified, e_1;
+            var _i, _a, providerDetail, provider, address_2, validAddress_1, err_1, address, providerName, userId, rdns, validAddress, domain, isAlreadyIdentified, e_1;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -587,7 +591,8 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         if (userId) {
                             this.currentUserId = userId;
-                            (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId);
+                            domain = (0, cookiePolicy_1.getIdentityCookieDomain)(this.crossSubdomainCookies);
+                            (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId, __assign({ path: "/" }, (domain ? { domain: domain } : {})));
                         }
                         isAlreadyIdentified = this.session.isWalletIdentified(validAddress, rdns || "");
                         logger_1.logger.debug("Identify: Checking deduplication", {

package/dist/cjs/src/FormoAnalyticsProvider.js

@@ -99,6 +99,7 @@ var InitializedAnalytics = function (_a) {
         var serializableOptions = {
             tracking: options.tracking,
             autocapture: options.autocapture,
+            crossSubdomainCookies: options.crossSubdomainCookies,
             apiHost: options.apiHost,
             flushAt: options.flushAt,
             flushInterval: options.flushInterval,

package/dist/cjs/src/consent/index.js

@@ -12,6 +12,7 @@ exports.setConsentFlag = setConsentFlag;
 exports.getConsentFlag = getConsentFlag;
 exports.removeConsentFlag = removeConsentFlag;
 var hash_1 = require("../utils/hash");
+var domain_1 = require("../utils/domain");
 /**
  * Generate a project-specific cookie key to avoid conflicts between different Formo projects
  * Uses hashed writeKey for privacy and security
@@ -41,7 +42,14 @@ function setConsentFlag(projectId, key, value) {
         var expires = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toUTCString(); // 1 year (GDPR compliant)
         var isSecure = ((_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.protocol) === 'https:';
         // Enhanced privacy settings: Secure (HTTPS), SameSite=Strict for consent cookies
-        document.cookie = "".concat(projectSpecificKey, "=").concat(encodeURIComponent(value), "; expires=").concat(expires, "; path=/; SameSite=Strict").concat(isSecure ? '; Secure' : '');
+        var domain = (0, domain_1.getApexDomain)();
+        var domainAttr = domain ? "; domain=.".concat(domain) : '';
+        // Expire any legacy host-only cookie (pre-domain-attribute versions) so it
+        // doesn't shadow the new domain-wide cookie in document.cookie reads.
+        if (domain) {
+            document.cookie = "".concat(projectSpecificKey, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;");
+        }
+        document.cookie = "".concat(projectSpecificKey, "=").concat(encodeURIComponent(value), "; expires=").concat(expires, "; path=/").concat(domainAttr, "; SameSite=Strict").concat(isSecure ? '; Secure' : '');
     }
 }
 /**
@@ -88,15 +96,9 @@ function deleteCookieDirectly(cookieName) {
     // Clear from current domain/path
     document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;");
     // Try to clear from parent domain if it's a proper multi-level domain
-    if (typeof window !== 'undefined') {
-        var hostname = window.location.hostname;
-        var parts = hostname.split('.');
-        // Only try parent domain deletion for proper domains with multiple parts
-        // Skip localhost and single-level domains
-        if (parts.length >= 2 && hostname !== 'localhost') {
-            var domain = parts.slice(-2).join('.');
-            document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.").concat(domain, ";");
-        }
+    var domain = (0, domain_1.getApexDomain)();
+    if (domain) {
+        document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.").concat(domain, ";");
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/event/EventFactory.js

@@ -295,22 +295,22 @@ var EventFactory = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var commonEventData, eventChainId, validAddress, processedEvent;
             var _a;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         _a = {};
                         return [4 /*yield*/, this.generateContext(context)];
                     case 1:
-                        commonEventData = (_a.context = _c.sent(),
+                        commonEventData = (_a.context = _d.sent(),
                             _a.original_timestamp = (0, timestamp_1.getCurrentTimeFormatted)(),
                             _a.user_id = formoEvent.user_id,
                             _a.type = formoEvent.type,
                             _a.channel = constants_2.CHANNEL,
                             _a.version = constants_2.VERSION,
                             _a);
-                        commonEventData.anonymous_id = (0, utils_2.generateAnonymousId)(constants_1.LOCAL_ANONYMOUS_ID_KEY);
-                        eventChainId = (_b = formoEvent.properties) === null || _b === void 0 ? void 0 : _b.chainId;
+                        commonEventData.anonymous_id = (0, utils_2.generateAnonymousId)(constants_1.LOCAL_ANONYMOUS_ID_KEY, (_b = this.options) === null || _b === void 0 ? void 0 : _b.crossSubdomainCookies);
+                        eventChainId = (_c = formoEvent.properties) === null || _c === void 0 ? void 0 : _c.chainId;
                         validAddress = this.validateEventAddress(formoEvent.address, eventChainId);
                         commonEventData.address = validAddress;
                         processedEvent = (0, mergeDeepRight_1.default)(formoEvent, commonEventData);

package/dist/cjs/src/event/utils.d.ts

@@ -1,5 +1,4 @@
 import { AnonymousID } from "../types";
-declare const generateAnonymousId: (key: string) => AnonymousID;
-declare function getCookieDomain(hostname?: string): string;
-export { generateAnonymousId, getCookieDomain };
+declare const generateAnonymousId: (key: string, crossSubdomainCookies?: boolean) => AnonymousID;
+export { generateAnonymousId };
 //# sourceMappingURL=utils.d.ts.map

package/dist/cjs/src/event/utils.js

@@ -1,33 +1,33 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAnonymousId = void 0;
-exports.getCookieDomain = getCookieDomain;
 var utils_1 = require("../utils");
 var storage_1 = require("../storage");
-var generateAnonymousId = function (key) {
+var cookiePolicy_1 = require("../storage/cookiePolicy");
+var generateAnonymousId = function (key, crossSubdomainCookies) {
     var storedAnonymousId = (0, storage_1.cookie)().get(key);
-    if (storedAnonymousId && typeof storedAnonymousId === "string")
-        return storedAnonymousId;
-    var newAnonymousId = (0, utils_1.generateNativeUUID)();
-    (0, storage_1.cookie)().set(key, newAnonymousId, {
-        maxAge: Date.now() + 1000 * 60 * 60 * 24 * 365, // 1 year
-        domain: getCookieDomain(),
-        path: "/",
-    });
-    return newAnonymousId;
+    var anonymousId = (storedAnonymousId && typeof storedAnonymousId === "string"
+        ? storedAnonymousId
+        : (0, utils_1.generateNativeUUID)());
+    var domain = (0, cookiePolicy_1.getIdentityCookieDomain)(crossSubdomainCookies);
+    // Re-set the cookie with the configured scope. When crossSubdomainCookies
+    // is true, this migrates legacy host-only cookies on the current host to the apex
+    // domain. Note: host-only cookies on other hosts (e.g. a cookie set on
+    // example.com is not visible from app.example.com) cannot be migrated
+    // until the user revisits that host.
+    (0, storage_1.cookie)().set(key, anonymousId, __assign({ expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365).toUTCString(), path: "/" }, (domain ? { domain: domain } : {})));
+    return anonymousId;
 };
 exports.generateAnonymousId = generateAnonymousId;
-function getCookieDomain(hostname) {
-    if (hostname === void 0) { hostname = window.location.hostname; }
-    // Special cases
-    if (hostname.includes("localhost") ||
-        /^\d{1,3}(\.\d{1,3}){3}$/.test(hostname)) {
-        // Localhost or IP address
-        return "";
-    }
-    var parts = hostname.split(".");
-    if (parts.includes("www"))
-        parts.splice(parts.indexOf("www"), 1);
-    return ".".concat(parts.join("."));
-}
 //# sourceMappingURL=utils.js.map

package/dist/cjs/src/queue/EventQueue.d.ts

@@ -28,7 +28,7 @@ export declare class EventQueue implements IEventQueue {
     constructor(writeKey: string, options: Options);
     private generateMessageId;
     enqueue(event: IFormoEvent, callback?: (...args: any) => void): Promise<void>;
-    flush(callback?: (...args: any) => void): Promise<void | IFormoEventFlushPayload[]>;
+    flush(callback?: (...args: any) => void, drainAll?: boolean): Promise<void | IFormoEventFlushPayload[]>;
     /**
      * Returns the UTF-8 byte length of a string. The browser's keepalive limit
      * is enforced on the wire (UTF-8 bytes), not on JS string length (UTF-16

package/dist/cjs/src/queue/EventQueue.js

@@ -124,12 +124,12 @@ var EventQueue = /** @class */ (function () {
             });
             // Catches the page being hidden, including scenarios like closing the tab.
             document.addEventListener("pagehide", function () {
-                isAccessible = document.visibilityState === "hidden";
+                isAccessible = document.visibilityState !== "hidden";
                 handleOnLeave();
             });
             // Catches visibility changes, such as switching tabs or minimizing the browser.
             document.addEventListener("visibilitychange", function () {
-                isAccessible = true;
+                isAccessible = document.visibilityState !== "hidden";
                 if (document.visibilityState === "hidden") {
                     handleOnLeave();
                 }
@@ -155,7 +155,7 @@ var EventQueue = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!(isAccessible === false)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.flush()];
+                        return [4 /*yield*/, this.flush(undefined, true)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
@@ -185,10 +185,8 @@ var EventQueue = /** @class */ (function () {
                         return [4 /*yield*/, this.generateMessageId(event)];
                     case 1:
                         message_id = _a.sent();
-                        return [4 /*yield*/, this.isDuplicate(message_id)];
-                    case 2:
                         // check if the message already exists
-                        if (_a.sent()) {
+                        if (this.isDuplicate(message_id)) {
                             logger_1.logger.warn("Event already enqueued, try again after ".concat((0, utils_1.millisecondsToSecond)(this.flushIntervalMs), " seconds."));
                             return [2 /*return*/];
                         }
@@ -217,10 +215,11 @@ var EventQueue = /** @class */ (function () {
             });
         });
     };
-    EventQueue.prototype.flush = function (callback) {
-        return __awaiter(this, void 0, void 0, function () {
-            var items, sentAt, data, batches;
+    EventQueue.prototype.flush = function (callback_1) {
+        return __awaiter(this, arguments, void 0, function (callback, drainAll) {
+            var items, _i, items_1, item, sentAt, data, batches;
             var _this = this;
+            if (drainAll === void 0) { drainAll = false; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -234,13 +233,19 @@ var EventQueue = /** @class */ (function () {
                             return [2 /*return*/, Promise.resolve()];
                         }
                         if (!this.pendingFlush) return [3 /*break*/, 2];
+                        if (!!drainAll) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.pendingFlush];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        items = this.queue.splice(0, this.flushAt);
-                        this.payloadHashes.clear();
+                        items = this.queue.splice(0, drainAll ? this.queue.length : this.flushAt);
+                        // Only remove hashes for flushed items so duplicate detection remains
+                        // active for events still in the queue.
+                        for (_i = 0, items_1 = items; _i < items_1.length; _i++) {
+                            item = items_1[_i];
+                            this.payloadHashes.delete(item.message.message_id);
+                        }
                         sentAt = new Date().toISOString();
                         data = items.map(function (item) { return (__assign(__assign({}, item.message), { sent_at: sentAt })); });
                         batches = this.splitIntoBatches(items, data);
@@ -402,15 +407,11 @@ var EventQueue = /** @class */ (function () {
         return false;
     };
     EventQueue.prototype.isDuplicate = function (eventId) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                // check if exists a message with identical payload within 1 minute
-                if (this.payloadHashes.has(eventId))
-                    return [2 /*return*/, true];
-                this.payloadHashes.add(eventId);
-                return [2 /*return*/, false];
-            });
-        });
+        // check if exists a message with identical payload within 1 minute
+        if (this.payloadHashes.has(eventId))
+            return true;
+        this.payloadHashes.add(eventId);
+        return false;
     };
     return EventQueue;
 }());

package/dist/cjs/src/session/index.d.ts

@@ -38,15 +38,6 @@ export interface IFormoAnalyticsSession {
      */
     markWalletIdentified(address: string, rdns: string): void;
 }
-/**
- * Implementation of session management using cookies
- *
- * Tracks:
- * - Detected wallets (by RDNS) - to prevent duplicate detection events
- * - Identified wallet-address pairs - to prevent duplicate identification events
- *
- * Session data expires at end of day (86400 seconds).
- */
 export declare class FormoAnalyticsSession implements IFormoAnalyticsSession {
     /**
      * Generate a unique key for wallet identification tracking

package/dist/cjs/src/session/index.js

@@ -25,6 +25,7 @@ exports.SESSION_WALLET_IDENTIFIED_KEY = "wallet-identified";
  *
  * Session data expires at end of day (86400 seconds).
  */
+var MAX_SESSION_ENTRIES = 20;
 var FormoAnalyticsSession = /** @class */ (function () {
     function FormoAnalyticsSession() {
     }
@@ -62,6 +63,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var rdnses = ((_a = (0, storage_1.cookie)().get(exports.SESSION_WALLET_DETECTED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
         if (!rdnses.includes(rdns)) {
             rdnses.push(rdns);
+            if (rdnses.length > MAX_SESSION_ENTRIES) {
+                rdnses.splice(0, rdnses.length - MAX_SESSION_ENTRIES);
+            }
             (0, storage_1.cookie)().set(exports.SESSION_WALLET_DETECTED_KEY, rdnses.join(","), {
                 // Expires by the end of the day
                 expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
@@ -102,6 +106,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var alreadyExists = identifiedWallets.includes(identifiedKey);
         if (!alreadyExists) {
             identifiedWallets.push(identifiedKey);
+            if (identifiedWallets.length > MAX_SESSION_ENTRIES) {
+                identifiedWallets.splice(0, identifiedWallets.length - MAX_SESSION_ENTRIES);
+            }
             var newValue = identifiedWallets.join(",");
             (0, storage_1.cookie)().set(exports.SESSION_WALLET_IDENTIFIED_KEY, newValue, {
                 // Expires by the end of the day

package/dist/cjs/src/solana/SolanaAdapter.d.ts

@@ -26,11 +26,10 @@ export declare class SolanaAdapter {
      */
     private pendingTransactions;
     /**
-     * Original adapter methods that we wrap for tracking
+     * Per-adapter original methods stored in a WeakMap to prevent routing
+     * to the wrong wallet after switching adapters.
      */
-    private originalAdapterSendTransaction?;
-    private originalAdapterSignMessage?;
-    private originalAdapterSignTransaction?;
+    private adapterOriginals;
     /**
      * Bound wrapper references — used to detect when external code (e.g. StandardWalletAdapter._reset())
      * overwrites our wraps so we can re-apply them.

package/dist/cjs/src/solana/SolanaAdapter.js

@@ -118,6 +118,11 @@ var SolanaAdapter = /** @class */ (function () {
          * Key: transaction signature, Value: transaction details
          */
         this.pendingTransactions = new Map();
+        /**
+         * Per-adapter original methods stored in a WeakMap to prevent routing
+         * to the wrong wallet after switching adapters.
+         */
+        this.adapterOriginals = new WeakMap();
         /**
          * Track active polling timeout IDs for cleanup
          */
@@ -147,21 +152,22 @@ var SolanaAdapter = /** @class */ (function () {
     SolanaAdapter.prototype.restoreOriginalMethods = function () {
         // Restore adapter methods
         if (this.wrappedAdapter) {
-            if (this.originalAdapterSendTransaction) {
-                this.wrappedAdapter.sendTransaction = this.originalAdapterSendTransaction;
-            }
-            if (this.originalAdapterSignMessage) {
-                this.wrappedAdapter.signMessage = this.originalAdapterSignMessage;
-            }
-            if (this.originalAdapterSignTransaction) {
-                this.wrappedAdapter.signTransaction = this.originalAdapterSignTransaction;
+            var originals = this.adapterOriginals.get(this.wrappedAdapter);
+            if (originals) {
+                if (originals.sendTransaction) {
+                    this.wrappedAdapter.sendTransaction = originals.sendTransaction;
+                }
+                if (originals.signMessage) {
+                    this.wrappedAdapter.signMessage = originals.signMessage;
+                }
+                if (originals.signTransaction) {
+                    this.wrappedAdapter.signTransaction = originals.signTransaction;
+                }
+                this.adapterOriginals.delete(this.wrappedAdapter);
             }
             this.wrappedAdapter = undefined;
         }
-        // Clear original and bound wrapper references
-        this.originalAdapterSendTransaction = undefined;
-        this.originalAdapterSignMessage = undefined;
-        this.originalAdapterSignTransaction = undefined;
+        // Clear bound wrapper references
         this.boundWrappedSendTransaction = undefined;
         this.boundWrappedSignMessage = undefined;
         this.boundWrappedSignTransaction = undefined;
@@ -390,24 +396,26 @@ var SolanaAdapter = /** @class */ (function () {
         }
         // Store reference to adapter for cleanup
         this.wrappedAdapter = adapter;
+        var originals = {};
         // Wrap sendTransaction
         if (adapter.sendTransaction) {
-            this.originalAdapterSendTransaction = adapter.sendTransaction.bind(adapter);
+            originals.sendTransaction = adapter.sendTransaction.bind(adapter);
             this.boundWrappedSendTransaction = this.wrappedSendTransaction.bind(this);
             adapter.sendTransaction = this.boundWrappedSendTransaction;
         }
         // Wrap signMessage
         if (adapter.signMessage) {
-            this.originalAdapterSignMessage = adapter.signMessage.bind(adapter);
+            originals.signMessage = adapter.signMessage.bind(adapter);
             this.boundWrappedSignMessage = this.wrappedSignMessage.bind(this);
             adapter.signMessage = this.boundWrappedSignMessage;
         }
         // Wrap signTransaction
         if (adapter.signTransaction) {
-            this.originalAdapterSignTransaction = adapter.signTransaction.bind(adapter);
+            originals.signTransaction = adapter.signTransaction.bind(adapter);
             this.boundWrappedSignTransaction = this.wrappedSignTransaction.bind(this);
             adapter.signTransaction = this.boundWrappedSignTransaction;
         }
+        this.adapterOriginals.set(adapter, originals);
     };
     /**
      * Re-wrap methods that were overwritten by external code.
@@ -419,9 +427,10 @@ var SolanaAdapter = /** @class */ (function () {
      */
     SolanaAdapter.prototype.rewrapOverwrittenMethods = function (adapter) {
         var rewrapped = false;
+        var originals = this.adapterOriginals.get(adapter) || {};
         // signMessage
         if (adapter.signMessage && adapter.signMessage !== this.boundWrappedSignMessage) {
-            this.originalAdapterSignMessage = adapter.signMessage.bind(adapter);
+            originals.signMessage = adapter.signMessage.bind(adapter);
             if (!this.boundWrappedSignMessage) {
                 this.boundWrappedSignMessage = this.wrappedSignMessage.bind(this);
             }
@@ -429,11 +438,11 @@ var SolanaAdapter = /** @class */ (function () {
             rewrapped = true;
         }
         else if (!adapter.signMessage && this.boundWrappedSignMessage) {
-            this.originalAdapterSignMessage = undefined;
+            originals.signMessage = undefined;
         }
         // signTransaction
         if (adapter.signTransaction && adapter.signTransaction !== this.boundWrappedSignTransaction) {
-            this.originalAdapterSignTransaction = adapter.signTransaction.bind(adapter);
+            originals.signTransaction = adapter.signTransaction.bind(adapter);
             if (!this.boundWrappedSignTransaction) {
                 this.boundWrappedSignTransaction = this.wrappedSignTransaction.bind(this);
             }
@@ -441,17 +450,18 @@ var SolanaAdapter = /** @class */ (function () {
             rewrapped = true;
         }
         else if (!adapter.signTransaction && this.boundWrappedSignTransaction) {
-            this.originalAdapterSignTransaction = undefined;
+            originals.signTransaction = undefined;
         }
         // sendTransaction — unlikely to be overwritten but check for completeness
         if (adapter.sendTransaction && adapter.sendTransaction !== this.boundWrappedSendTransaction) {
-            this.originalAdapterSendTransaction = adapter.sendTransaction.bind(adapter);
+            originals.sendTransaction = adapter.sendTransaction.bind(adapter);
             if (!this.boundWrappedSendTransaction) {
                 this.boundWrappedSendTransaction = this.wrappedSendTransaction.bind(this);
             }
             adapter.sendTransaction = this.boundWrappedSendTransaction;
             rewrapped = true;
         }
+        this.adapterOriginals.set(adapter, originals);
         if (rewrapped) {
             logger_1.logger.debug("SolanaAdapter: Re-wrapped overwritten adapter methods");
         }
@@ -461,12 +471,13 @@ var SolanaAdapter = /** @class */ (function () {
      */
     SolanaAdapter.prototype.wrappedSendTransaction = function (transaction, connection, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var chainId, address, signature, error_1;
+            var originals, chainId, address, signature, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.checkAndRebindContextAdapter();
-                        if (!this.originalAdapterSendTransaction) {
+                        originals = this.wrappedAdapter ? this.adapterOriginals.get(this.wrappedAdapter) : undefined;
+                        if (!(originals === null || originals === void 0 ? void 0 : originals.sendTransaction)) {
                             throw new Error("sendTransaction not available");
                         }
                         chainId = this.chainId;
@@ -475,7 +486,7 @@ var SolanaAdapter = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.originalAdapterSendTransaction(transaction, connection, options)];
+                        return [4 /*yield*/, originals.sendTransaction(transaction, connection, options)];
                     case 2:
                         signature = _a.sent();
                         this.emitTransactionEvent(events_1.TransactionStatus.BROADCASTED, address, chainId, signature);
@@ -501,12 +512,13 @@ var SolanaAdapter = /** @class */ (function () {
      */
     SolanaAdapter.prototype.wrappedSignMessage = function (message) {
         return __awaiter(this, void 0, void 0, function () {
-            var chainId, address, messageString, signature, signatureHex, error_2;
+            var originals, chainId, address, messageString, signature, signatureHex, error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.checkAndRebindContextAdapter();
-                        if (!this.originalAdapterSignMessage) {
+                        originals = this.wrappedAdapter ? this.adapterOriginals.get(this.wrappedAdapter) : undefined;
+                        if (!(originals === null || originals === void 0 ? void 0 : originals.signMessage)) {
                             throw new Error("signMessage not available");
                         }
                         chainId = this.chainId;
@@ -516,7 +528,7 @@ var SolanaAdapter = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.originalAdapterSignMessage(message)];
+                        return [4 /*yield*/, originals.signMessage(message)];
                     case 2:
                         signature = _a.sent();
                         signatureHex = uint8ArrayToHex(signature);
@@ -536,12 +548,13 @@ var SolanaAdapter = /** @class */ (function () {
      */
     SolanaAdapter.prototype.wrappedSignTransaction = function (transaction) {
         return __awaiter(this, void 0, void 0, function () {
-            var chainId, address, message, signedTx, error_3;
+            var originals, chainId, address, message, signedTx, error_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.checkAndRebindContextAdapter();
-                        if (!this.originalAdapterSignTransaction) {
+                        originals = this.wrappedAdapter ? this.adapterOriginals.get(this.wrappedAdapter) : undefined;
+                        if (!(originals === null || originals === void 0 ? void 0 : originals.signTransaction)) {
                             throw new Error("signTransaction not available");
                         }
                         chainId = this.chainId;
@@ -551,7 +564,7 @@ var SolanaAdapter = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.originalAdapterSignTransaction(transaction)];
+                        return [4 /*yield*/, originals.signTransaction(transaction)];
                     case 2:
                         signedTx = _a.sent();
                         this.emitSignatureEvent(events_1.SignatureStatus.CONFIRMED, address, chainId, message);

package/dist/cjs/src/storage/StorageManager.js

@@ -23,11 +23,19 @@ var StorageManager = /** @class */ (function () {
     StorageManager.prototype.getStorage = function (type) {
         if (!this.storages.has(type)) {
             var storage = this.createStorage(type);
+            var currentType = type;
             // If storage is not available, try next
             while (!storage.isAvailable()) {
-                var index = TYPES.indexOf(type);
-                logger_1.logger.warn("Storage ".concat(type, " is not available, trying ").concat(TYPES[index + 1]));
-                storage = this.createStorage(TYPES[index + 1]);
+                var index = TYPES.indexOf(currentType);
+                if (index === -1 || index + 1 >= TYPES.length) {
+                    // No more fallbacks, use memory storage as last resort
+                    storage = this.createStorage("memoryStorage");
+                    break;
+                }
+                var prevType = currentType;
+                currentType = TYPES[index + 1];
+                logger_1.logger.warn("Storage ".concat(prevType, " is not available, trying ").concat(currentType));
+                storage = this.createStorage(currentType);
             }
             // Add to cache
             this.storages.set(type, storage);