tool-db 2.6.2 → 2.6.6

package/dist/tooldb.d.ts

@@ -11,6 +11,7 @@ import toolDbFunction from "./toolDbFunction";
 import toolDbAnonSignIn from "./toolDbAnonSignIn";
 import toolDbClientOnMessage from "./toolDbClientOnMessage";
 import toolDbVerificationWrapper from "./toolDbVerificationWrapper";
+import toolDbCheckSignupConflicts from "./toolDbCheckSignupConflicts";
 import toolDbQueryKeys from "./toolDbQueryKeys";
 import toolDbKeysSignIn from "./toolDbKeysSignIn";
 import toolDbSubscribe from "./toolDbSubscribe";
@@ -36,9 +37,11 @@ interface Verificator<T> {
 export default class ToolDb extends EventEmitter {
     private _network;
     private _store;
+    private _peerStore;
     private _serverPeers;
     private _peerAccount;
     private _userAccount;
+    private _initPromise;
     logger: typeof logger;
     clientOnMessage: typeof toolDbClientOnMessage;
     verifyMessage: typeof verifyMessage;
@@ -71,6 +74,7 @@ export default class ToolDb extends EventEmitter {
     keysSignIn: typeof toolDbKeysSignIn;
     signUp: typeof toolDbSignUp;
     verify: typeof toolDbVerificationWrapper;
+    _checkSignupConflicts: typeof toolDbCheckSignupConflicts;
     handlePing: typeof handlePing;
     handlePong: typeof handlePong;
     handleCrdtGet: typeof handleCrdtGet;
@@ -118,6 +122,20 @@ export default class ToolDb extends EventEmitter {
     get store(): ToolDbStorageAdapter;
     get userAccount(): ToolDbUserAdapter;
     get peerAccount(): ToolDbUserAdapter;
+    /**
+     * Promise that resolves when the database is fully initialized.
+     * Use this to wait for initialization before using the database.
+     */
+    get ready(): Promise<void>;
     constructor(options?: Partial<ToolDbOptions>);
+    /**
+     * Initialize peer and user accounts from storage or create new ones.
+     */
+    private _initializeAccounts;
+    /**
+     * Properly closes all stores to prevent resource leaks.
+     * Call this when you're done with the database instance.
+     */
+    close(): Promise<void>;
 }
 export {};

package/dist/tooldb.js

@@ -40,7 +40,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -77,6 +77,7 @@ var toolDbFunction_1 = __importDefault(require("./toolDbFunction"));
 var toolDbAnonSignIn_1 = __importDefault(require("./toolDbAnonSignIn"));
 var toolDbClientOnMessage_1 = __importDefault(require("./toolDbClientOnMessage"));
 var toolDbVerificationWrapper_1 = __importDefault(require("./toolDbVerificationWrapper"));
+var toolDbCheckSignupConflicts_1 = __importDefault(require("./toolDbCheckSignupConflicts"));
 var toolDbQueryKeys_1 = __importDefault(require("./toolDbQueryKeys"));
 var toolDbKeysSignIn_1 = __importDefault(require("./toolDbKeysSignIn"));
 var toolDbSubscribe_1 = __importDefault(require("./toolDbSubscribe"));
@@ -133,6 +134,7 @@ var ToolDb = /** @class */ (function (_super) {
         _this.keysSignIn = toolDbKeysSignIn_1.default;
         _this.signUp = toolDbSignUp_1.default;
         _this.verify = toolDbVerificationWrapper_1.default;
+        _this._checkSignupConflicts = toolDbCheckSignupConflicts_1.default;
         // All message handlers go here
         _this.handlePing = handlePing_1.default;
         _this.handlePong = handlePong_1.default;
@@ -233,40 +235,17 @@ var ToolDb = /** @class */ (function (_super) {
         _this._store = new _this.options.storageAdapter(_this);
         _this._peerAccount = new _this.options.userAdapter(_this);
         _this._userAccount = new _this.options.userAdapter(_this);
+        // Create network adapter synchronously so it can listen to "init" event
+        // The network adapter will wait for the "init" event before doing anything critical
         _this._network = new _this.options.networkAdapter(_this);
         var DEFAULT_KEYS = "%default-peer%";
+        var DEFAULT_USER_KEYS = "%default-user%";
         // DO NOT USE THE DEFAULT STORE FOR KEYS
-        var tempStore = new _this.options.storageAdapter(_this, "_____peer_" + _this.options.storageName);
-        tempStore
-            .get(DEFAULT_KEYS)
-            .then(function (val) {
-            _this.peerAccount
-                .decryptAccount(JSON.parse(val), DEFAULT_KEYS)
-                .then(function (a) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.peerAccount.setUser(a, (0, _1.randomAnimal)())];
-                        case 1:
-                            _a.sent();
-                            return [2 /*return*/];
-                    }
-                });
-            }); })
-                .finally(function () {
-                _this.emit("init", _this.userAccount.getAddress());
-            });
-        })
-            .catch(function (_e) {
-            _this.peerAccount.encryptAccount(DEFAULT_KEYS).then(function (a) {
-                tempStore
-                    .put(DEFAULT_KEYS, JSON.stringify(a))
-                    .catch(function () {
-                    // nothing
-                })
-                    .finally(function () {
-                    _this.emit("init", _this.userAccount.getAddress());
-                });
-            });
+        _this._peerStore = new _this.options.storageAdapter(_this, "_____peer_" + _this.options.storageName);
+        // Initialize accounts - this will emit "init" event when done
+        _this._initPromise = _this._initializeAccounts(_this._peerStore, DEFAULT_KEYS, DEFAULT_USER_KEYS).catch(function (err) {
+            _this.logger("Failed to initialize ToolDb", err);
+            throw err;
         });
         return _this;
     }
@@ -347,6 +326,115 @@ var ToolDb = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(ToolDb.prototype, "ready", {
+        /**
+         * Promise that resolves when the database is fully initialized.
+         * Use this to wait for initialization before using the database.
+         */
+        get: function () {
+            return this._initPromise;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Initialize peer and user accounts from storage or create new ones.
+     */
+    ToolDb.prototype._initializeAccounts = function (tempStore, peerKey, userKey) {
+        return __awaiter(this, void 0, void 0, function () {
+            var val, account, _e_1, encrypted, _putError_1, userVal, userAccount, userName, _e_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 4, , 11]);
+                        return [4 /*yield*/, tempStore.get(peerKey)];
+                    case 1:
+                        val = _a.sent();
+                        return [4 /*yield*/, this.peerAccount.decryptAccount(JSON.parse(val), peerKey)];
+                    case 2:
+                        account = _a.sent();
+                        return [4 /*yield*/, this.peerAccount.setUser(account, (0, _1.randomAnimal)())];
+                    case 3:
+                        _a.sent();
+                        return [3 /*break*/, 11];
+                    case 4:
+                        _e_1 = _a.sent();
+                        // No peer account found, create anonymous peer account
+                        return [4 /*yield*/, this.peerAccount.anonUser()];
+                    case 5:
+                        // No peer account found, create anonymous peer account
+                        _a.sent();
+                        return [4 /*yield*/, this.peerAccount.encryptAccount(peerKey)];
+                    case 6:
+                        encrypted = _a.sent();
+                        _a.label = 7;
+                    case 7:
+                        _a.trys.push([7, 9, , 10]);
+                        return [4 /*yield*/, tempStore.put(peerKey, JSON.stringify(encrypted))];
+                    case 8:
+                        _a.sent();
+                        return [3 /*break*/, 10];
+                    case 9:
+                        _putError_1 = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 10: return [3 /*break*/, 11];
+                    case 11:
+                        _a.trys.push([11, 15, , 17]);
+                        return [4 /*yield*/, tempStore.get(userKey)];
+                    case 12:
+                        userVal = _a.sent();
+                        return [4 /*yield*/, this.userAccount.decryptAccount(JSON.parse(userVal), userKey)];
+                    case 13:
+                        userAccount = _a.sent();
+                        userName = (userAccount === null || userAccount === void 0 ? void 0 : userAccount.name) ||
+                            this.userAccount.getUsername() ||
+                            (0, _1.randomAnimal)();
+                        return [4 /*yield*/, this.userAccount.setUser(userAccount, userName)];
+                    case 14:
+                        _a.sent();
+                        return [3 /*break*/, 17];
+                    case 15:
+                        _e_2 = _a.sent();
+                        // No saved user, generate anonymous user
+                        return [4 /*yield*/, this.userAccount.anonUser()];
+                    case 16:
+                        // No saved user, generate anonymous user
+                        _a.sent();
+                        return [3 /*break*/, 17];
+                    case 17:
+                        // Emit init event after both accounts are ready
+                        this.emit("init", this.userAccount.getAddress());
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Properly closes all stores to prevent resource leaks.
+     * Call this when you're done with the database instance.
+     */
+    ToolDb.prototype.close = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(this._store && typeof this._store.close === "function")) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this._store.close()];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        if (!(this._peerStore &&
+                            typeof this._peerStore.close === "function")) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this._peerStore.close()];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return ToolDb;
 }(events_1.default));
 exports.default = ToolDb;

package/dist/tooldb.js.map

@@ -1 +1 @@
-{"version":3,"file":"tooldb.js","sourceRoot":"","sources":["../lib/tooldb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tooldb.js","sourceRoot":"","sources":["../lib/tooldb.ts"],"names":[],"mappings":"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"}

package/dist/types/message.d.ts

@@ -45,7 +45,7 @@ export interface VerificationData<T = any> {
      */
     c: string | null;
 }
-export declare type MessageType = "ping" | "pong" | "query" | "queryAck" | "function" | "functionReturn" | "subscribe" | "get" | "put" | "crdtPut" | "crdtGet" | "crdt";
+export type MessageType = "ping" | "pong" | "query" | "queryAck" | "function" | "functionReturn" | "subscribe" | "get" | "put" | "crdtPut" | "crdtGet" | "crdt";
 export interface BaseMessage {
     type: MessageType;
     /**
@@ -107,4 +107,4 @@ export interface CrdtGetMessage<T = any> extends BaseMessage {
     type: "crdtGet";
     key: string;
 }
-export declare type ToolDbMessage = PingMessage | PongMessage | QueryMessage | QueryAckMessage | FunctionMessage | FunctionReturnMessage | SubscribeMessage | GetMessage | PutMessage | CrdtPutMessage | CrdtGetMessage;
+export type ToolDbMessage = PingMessage | PongMessage | QueryMessage | QueryAckMessage | FunctionMessage | FunctionReturnMessage | SubscribeMessage | GetMessage | PutMessage | CrdtPutMessage | CrdtGetMessage;

package/dist/types/tooldb.d.ts

@@ -11,7 +11,7 @@ export interface Peer {
     address: string;
     sig: string;
 }
-export declare type ToolDbMessageHandler = (this: ToolDb, message: ToolDbMessage, remotePeerId: string) => void;
+export type ToolDbMessageHandler = (this: ToolDb, message: ToolDbMessage, remotePeerId: string) => void;
 export interface ToolDbOptions {
     /**
      * Show debug console logs
@@ -86,13 +86,13 @@ export interface ToolDbOptions {
         [module: string]: any;
     };
 }
-export declare type GenericObject = {
+export type GenericObject = {
     [key: string]: any;
 };
-export declare type AllowedFunctionArguments<A = GenericObject> = A;
-export declare type AllowedFunctionReturn<R = unknown> = R;
-export declare type FunctionCodes = "OK" | "ERR" | "NOT_FOUND";
-export declare type ServerFunction<R, A = GenericObject> = (args: AllowedFunctionArguments<A>) => Promise<AllowedFunctionReturn<R>>;
+export type AllowedFunctionArguments<A = GenericObject> = A;
+export type AllowedFunctionReturn<R = unknown> = R;
+export type FunctionCodes = "OK" | "ERR" | "NOT_FOUND";
+export type ServerFunction<R, A = GenericObject> = (args: AllowedFunctionArguments<A>) => Promise<AllowedFunctionReturn<R>>;
 export interface FunctionReturnBase {
     code: FunctionCodes;
 }
@@ -108,4 +108,4 @@ export interface FunctionReturnNotFound extends FunctionReturnBase {
     return: string;
     code: "NOT_FOUND";
 }
-export declare type FunctionReturn<R> = FunctionReturnOk<R> | FunctionReturnErr | FunctionReturnNotFound;
+export type FunctionReturn<R> = FunctionReturnOk<R> | FunctionReturnErr | FunctionReturnNotFound;

package/dist/utils/verifyMessage.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -87,8 +87,16 @@ function verifyMessage(msg, pow) {
                         })];
                 case 1:
                     data = _b.sent();
-                    if (data && data.a !== msg.a)
-                        return [2 /*return*/, __1.VerifyResult.CantOverwrite];
+                    // If data exists with a different author, compare timestamps
+                    // The OLDER timestamp wins (first writer owns forever)
+                    if (data && data.a !== msg.a) {
+                        if (data.t <= msg.t) {
+                            // Local data is older or same age - reject incoming
+                            return [2 /*return*/, __1.VerifyResult.CantOverwrite];
+                        }
+                        // Incoming data is older - let it through to handlePut
+                        // where it will replace our local data
+                    }
                     _b.label = 2;
                 case 2:
                     if (addressNamespace && addressNamespace !== msg.a) {

package/dist/utils/verifyMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../lib/utils/verifyMessage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../lib/utils/verifyMessage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wBAAoE;AAEpE;;;;;GAKG;AACH,SAA8B,aAAa,CAEzC,GAAiC,EACjC,GAAsB;IAAtB,oBAAA,EAAA,OAAsB;;;;;;oBAGhB,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAEtC,IACE,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS;wBACnB,GAAG,CAAC,CAAC,KAAK,SAAS,EACnB;wBACA,sBAAO,gBAAY,CAAC,WAAW,EAAC;qBACjC;oBAED,yCAAyC;oBACzC,kEAAkE;oBAClE,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE;wBACxC,6CAA6C;wBAC7C,sBAAO,gBAAY,CAAC,gBAAgB,EAAC;qBACtC;oBAGG,gBAAgB,GAAmB,KAAK,CAAC;oBAC7C,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE;wBAC5B,gBAAgB,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACjD;yBAIG,CAAA,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,CAAA,EAAzB,wBAAyB;oBACrB,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC;oBACL,qBAAM,IAAI,CAAC,KAAK;6BAC1B,GAAG,CAAC,GAAG,CAAC;6BACR,IAAI,CAAC,UAAC,IAAI;4BACT,IAAI;gCACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gCACjC,OAAO,OAAO,CAAC;6BAChB;4BAAC,OAAO,CAAC,EAAE;gCACV,OAAO,IAAI,CAAC;6BACb;wBACH,CAAC,CAAC;6BACD,KAAK,CAAC;4BACL,OAAO,IAAI,CAAC;wBACd,CAAC,CAAC,EAAA;;oBAZE,IAAI,GAAG,SAYT;oBAEJ,6DAA6D;oBAC7D,uDAAuD;oBACvD,IAAI,IAAI,IAAI,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE;wBAC5B,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE;4BACnB,oDAAoD;4BACpD,sBAAO,gBAAY,CAAC,aAAa,EAAC;yBACnC;wBACD,uDAAuD;wBACvD,uCAAuC;qBACxC;;;oBAGH,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,GAAG,CAAC,CAAC,EAAE;wBAClD,kDAAkD;wBAClD,sBAAO,gBAAY,CAAC,eAAe,EAAC;qBACrC;oBAED,sEAAsE;oBACtE,0EAA0E;oBAC1E,qEAAqE;oBACrE,2EAA2E;oBAC3E,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,GAAG,CAAC,EAAE;wBAC3B,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;4BAC7D,yCAAyC;4BACzC,sBAAO,gBAAY,CAAC,aAAa,EAAC;yBACnC;wBAED,IAAI,IAAA,UAAM,EAAC,UAAG,OAAO,SAAG,GAAG,CAAC,CAAC,SAAG,GAAG,CAAC,CAAC,SAAG,GAAG,CAAC,CAAC,CAAE,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE;4BAC1D,+DAA+D;4BAC/D,sBAAO,gBAAY,CAAC,gBAAgB,EAAC;yBACtC;qBACF;yBAEgB,IAAI,CAAC,WAAW,EAAhB,wBAAgB;oBAC7B,qBAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,EAAA;;oBAA3C,KAAA,SAA2C,CAAA;;;oBAC3C,KAAA,KAAK,CAAA;;;oBAFH,QAAQ,KAEL;oBACT,0EAA0E;oBAE1E,sBAAO,QAAQ,CAAC,CAAC,CAAC,gBAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAY,CAAC,gBAAgB,EAAC;;;;CACzE;AAzFD,gCAyFC"}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "tool-db",
-  "version": "2.6.2",
+  "version": "2.6.6",
   "description": "A decentralized database model for federated p2p networks.n",
   "author": "Manwe <manuel.etchegaray7@gmail.com>",
   "homepage": "https://github.com/Manwe-777/tool-db#readme",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "engines": {
@@ -28,5 +28,5 @@
     "typescript": "^4.7.4",
     "uglify-js": "^3.16.2"
   },
-  "gitHead": "d1ce553320888c1c5f0b99d6e7c06580cb4dadfd"
+  "gitHead": "4f705c44c8e4e48e43724774f9fee6250587a9b2"
 }

package/lib/adapters-base/networkAdapter.ts

@@ -1,218 +0,0 @@
-import {
-  ToolDb,
-  PingMessage,
-  ToolDbMessage,
-  Peer,
-  getPeerSignature,
-  textRandom,
-  uniq,
-} from "..";
-
-export default class ToolDbNetworkAdapter {
-  private _clientToSend: Record<string, (message: string) => void> = {};
-
-  private _isClientConnected: Record<string, () => boolean> = {};
-
-  private _clientIsServer: Record<string, boolean> = {};
-
-  private _tooldb: ToolDb;
-
-  constructor(db: ToolDb) {
-    this._tooldb = db;
-
-    // Wait for peerAccount to be initialized before adding ourselves to serverPeers
-    this.tooldb.once("init", () => {
-      if (this.tooldb.options.server) {
-        this.getMeAsPeer().then((meAsPeer) => {
-          this.tooldb.serverPeers.push(meAsPeer);
-        });
-      }
-    });
-  }
-
-  get clientToSend() {
-    return this._clientToSend;
-  }
-
-  get isClientConnected() {
-    return this._isClientConnected;
-  }
-
-  get tooldb() {
-    return this._tooldb;
-  }
-
-  public getMeAsPeer() {
-    const timestamp = new Date().getTime();
-    return getPeerSignature(
-      this.tooldb.peerAccount,
-      this.tooldb.options.topic,
-      timestamp,
-      this.tooldb.options.host,
-      this.tooldb.options.port
-    ).then((signature) => {
-      return {
-        topic: this.tooldb.options.topic,
-        timestamp: timestamp,
-        host: this.tooldb.options.host,
-        port: this.tooldb.options.port,
-        address: this.tooldb.peerAccount.getAddress() || "",
-        sig: signature,
-      } as Peer;
-    });
-  }
-
-  /**
-   * Check if the specified client is connected or not
-   * @param clientId Client ID
-   * @returns boolean
-   */
-  public isConnected(clientId: string) {
-    return this._isClientConnected[clientId]
-      ? this._isClientConnected[clientId]()
-      : false;
-  }
-
-  /**
-   * Check if the specified client is a server/relay
-   * @param clientId Client ID
-   * @returns boolean
-   */
-  public isServer(clientId: string) {
-    return this._clientIsServer[clientId] || false;
-  }
-
-  public craftPingMessage() {
-    return this.getMeAsPeer().then((meAsPeer) => {
-      return JSON.stringify({
-        type: "ping",
-        clientId: this.getClientAddress(),
-        to: [this.getClientAddress()],
-        isServer: this.tooldb.options.server,
-        id: textRandom(10),
-        peer: meAsPeer,
-      } as PingMessage);
-    });
-  }
-
-  /**
-   * Execute the function to send a message to the specified client ID
-   * @param clientId Client ID
-   * @param message Message
-   */
-  private executeSendToClient(clientId: string, message: string) {
-    if (this._clientToSend[clientId]) {
-      this._clientToSend[clientId](message);
-    }
-  }
-
-  public getClientAddress() {
-    // This is not a good idea to use on all adapters, so it should be replaced
-    // if its causing issues. The only reason we use the last 20 chars is to
-    // muse the same peer address as the webrtc adapter.
-    return (this.tooldb.peerAccount.getAddress() || "").slice(-20);
-  }
-
-  public onClientDisconnect(clientId: string) {
-    delete this._clientToSend[clientId];
-    delete this._clientIsServer[clientId];
-  }
-
-  /**
-   * Should be called as a message payload handler
-   * This function will take care of processing the messages and also making sure
-   * we use the correct response methods troughout the adapter.
-   * @param message message payload
-   * @param clientId Client ID (can be null for ping/pong)
-   * @param setClientId Callback to set the client id on the parent class
-   */
-  public onClientMessage(
-    message: string,
-    clientId: string | null,
-    setClientId: (clientId: string) => void
-  ) {
-    // this.tooldb.logger("onClientMessage", clientId);
-
-    if (clientId && !this.tooldb.processedOutHashes[clientId]) {
-      this.tooldb.processedOutHashes[clientId] = [];
-    }
-
-    try {
-      const parsedMessage = JSON.parse(message) as ToolDbMessage;
-      // We assume the first messages to arrive will always be ping or pong.
-      // Only after that we can get the client id for this socket.
-      if (parsedMessage.type === "ping" || parsedMessage.type === "pong") {
-        const cid = parsedMessage.clientId;
-        setClientId(cid);
-        this.tooldb.onPeerConnect(cid);
-        this._clientIsServer[cid] = parsedMessage.isServer;
-        this.tooldb.processedOutHashes[cid] = [];
-        this.tooldb.clientOnMessage(parsedMessage, cid);
-      } else if (clientId) {
-        this.tooldb.clientOnMessage(parsedMessage, clientId);
-      }
-    } catch (e) {
-      this.tooldb.logger("Got message ERR", message);
-      this.tooldb.logger(e);
-    }
-  }
-
-  /**
-   * Sends a message to all peers connected to us
-   * This function takes care of the message deduplication, making sure we dont send
-   * the same message twice to the same peer.
-   * @param msg message data
-   * @param crossServerOnly If this message should be send to server peers only
-   * @param isRelay if we should relay this message
-   */
-  public sendToAll(msg: ToolDbMessage, crossServerOnly = false) {
-    const to = uniq([...msg.to, this.getClientAddress()]);
-
-    const finalMessage = JSON.stringify({ ...msg, to });
-
-    const filteredConns = Object.keys(this.clientToSend)
-      .filter((id) => !to.includes(id))
-      .filter((clientId) => this.isConnected(clientId));
-
-    filteredConns.forEach((clientId) => {
-      if ((crossServerOnly && this.isServer(clientId)) || !crossServerOnly) {
-        this.tooldb.logger(to, "Sent out to:", clientId);
-
-        if (msg.type === "put" || msg.type === "crdtPut") {
-          if (!this.tooldb.processedOutHashes[clientId].includes(msg.data.h)) {
-            this.executeSendToClient(clientId, finalMessage);
-            this.tooldb.processedOutHashes[clientId].push(msg.data.h);
-          }
-        } else {
-          this.executeSendToClient(clientId, finalMessage);
-        }
-      }
-      // } else {
-      //   this.tooldb.logger("Fitlered out;", clientId);
-      // }
-    });
-  }
-
-  /**
-   * Sends a message to a single peer.
-   * This function also takes care of the message deduplication.
-   * @param clientId Peer/Client id we want to send to.
-   * @param msg message data
-   */
-  public sendToClientId(clientId: string, msg: ToolDbMessage) {
-    const to = uniq([...msg.to, this.getClientAddress()]);
-    const finalMessage = JSON.stringify({ ...msg, to });
-
-    if (msg.type === "put" || msg.type === "crdtPut") {
-      if (
-        clientId &&
-        !this.tooldb.processedOutHashes[clientId].includes(msg.data.h)
-      ) {
-        this.executeSendToClient(clientId, finalMessage);
-        this.tooldb.processedOutHashes[clientId].push(msg.data.h);
-      }
-    } else {
-      this.executeSendToClient(clientId, finalMessage);
-    }
-  }
-}

package/lib/adapters-base/storageAdapter.ts

@@ -1,57 +0,0 @@
-import { ToolDb } from "..";
-
-export default class ToolDbStorageAdapter {
-  private _tooldb: ToolDb;
-
-  private _forceStorageName: string | undefined;
-
-  /**
-   * Promise that resolves when the storage adapter is ready for operations.
-   * Subclasses should set this in their constructor.
-   */
-  protected _readyPromise: Promise<void> = Promise.resolve();
-
-  /**
-   * Public getter for the ready promise.
-   * Await this before performing operations if you need to ensure the store is ready.
-   */
-  get ready(): Promise<void> {
-    return this._readyPromise;
-  }
-
-  get tooldb() {
-    return this._tooldb;
-  }
-
-  get storageName() {
-    return this._forceStorageName || this._tooldb.options.storageName;
-  }
-
-  constructor(db: ToolDb, forceStorageName?: string) {
-    this._tooldb = db;
-
-    if (forceStorageName) {
-      this._forceStorageName = forceStorageName;
-    }
-  }
-
-  /**
-   * Wait for the storage adapter to be ready.
-   * Called internally by put/get/query operations.
-   */
-  protected async waitForReady(): Promise<void> {
-    await this._readyPromise;
-  }
-
-  put(key: string, data: string): Promise<unknown> {
-    return Promise.resolve();
-  }
-
-  get(key: string): Promise<string> {
-    return Promise.resolve("");
-  }
-
-  query(key: string): Promise<string[]> {
-    return Promise.resolve([]);
-  }
-}