@samet-it/be-couchbase-common 1.0.7 → 1.0.9

package/dist/adapter/cb-adapter.service.d.ts

@@ -6,9 +6,7 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
     private readonly _CLEAR_ERROR_INTERVAL;
     private logger;
     private _connected;
-    private _undefined;
     private _cluster;
-    private readonly _cbErrors;
     private readonly _nativeErrors;
     constructor();
     /**
@@ -46,8 +44,6 @@ export declare class CbAdapterService implements CbAdapterServiceLike {
     /** {@inheritDoc} */
     first<T>(rows: Array<T>): T | undefined;
     /** {@inheritDoc} */
-    checkError(p1: string | Error, p2?: Error): void;
-    /** {@inheritDoc} */
     createIndex<T = Record<string, unknown>>(coll: Collection, p1: (keyof T | string) | Array<keyof T | string>, name?: string): Promise<void>;
     /** {@inheritDoc} */
     createBaseIndices(coll: Collection, ...keys: Array<keyof CbEntity>): Promise<void>;

package/dist/adapter/cb-adapter.service.js

@@ -54,25 +54,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CbAdapterService = void 0;
 const couchbase = __importStar(require("couchbase"));
-const common_1 = require("@nestjs/common");
 const couchbase_1 = require("couchbase");
+const common_1 = require("@nestjs/common");
 const config_1 = require("../config");
 // noinspection JSUnusedGlobalSymbols
 let CbAdapterService = class CbAdapterService {
     constructor() {
         this._CLEAR_ERROR_INTERVAL = 1000 * 60 * 60 * 24; // daily
-        this._undefined = 0;
-        this._cbErrors = new Map();
         this._nativeErrors = new Map();
         this.logger = new common_1.Logger(this.constructor.name);
         this._clearErrors();
-        this._cbErrors.set('AmbiguousTimeoutError', { count: 0, log: true, known: true });
-        this._cbErrors.set('AuthenticationFailureError', { count: 0, log: true, known: true });
-        this._cbErrors.set('ConnectionClosedError', { count: 0, log: true, known: true });
-        this._cbErrors.set('InternalServerFailureError', { count: 0, log: true, known: true });
-        this._cbErrors.set('ServiceNotAvailableError', { count: 0, log: true, known: true });
-        this._cbErrors.set('TimeoutError', { count: 0, log: true, known: true });
-        this._cbErrors.set('UnambiguousTimeoutError', { count: 0, log: true, known: true });
     }
     /**
      * Clear native errors
@@ -90,6 +81,7 @@ let CbAdapterService = class CbAdapterService {
                 yield this.exec(this._cluster.ping(), { name: 'ping' });
             }
             catch (err) {
+                this.logger.warn(`Ping error => [${err.name}: ${err.message}]`);
             }
             setTimeout(() => this._ping(), 30000);
         });
@@ -107,7 +99,10 @@ let CbAdapterService = class CbAdapterService {
                 if (e instanceof couchbase_1.IndexExistsError) {
                     return undefined;
                 }
-                this.logger.error(`!index[${(_a = e.name) !== null && _a !== void 0 ? _a : ''}] #${scope.name}] => ${sql}`, e);
+                this.logger.error(`Index error => [${e.name}: ${e.message}] ${JSON.stringify({
+                    scope: scope === null || scope === void 0 ? void 0 : scope.name,
+                    bucket: (_a = scope === null || scope === void 0 ? void 0 : scope.bucket) === null || _a === void 0 ? void 0 : _a.name
+                })}`);
                 // throw e; // TODO
             }
         });
@@ -154,18 +149,20 @@ let CbAdapterService = class CbAdapterService {
         }
     }
     _checkError(err, opt) {
-        var _a;
+        var _a, _b, _c;
+        let size = 1;
         if (!this._nativeErrors.has(err)) {
-            this._nativeErrors.set(err, 1);
+            this._nativeErrors.set(err, size);
         }
         else {
-            this._nativeErrors.set(err, this._nativeErrors.get(err) + 1);
+            size = this._nativeErrors.get(err) + 1;
+            this._nativeErrors.set(err, size);
         }
         if ((_a = opt === null || opt === void 0 ? void 0 : opt.ignoredErrors) === null || _a === void 0 ? void 0 : _a.includes(err)) {
-            this.logger.warn(`${opt.name} => (${err.name})${err.message}`);
+            this.logger.warn(`[${size}] ${(_b = opt.name) !== null && _b !== void 0 ? _b : 'Ignored error'} => [${err.name}: ${err.message}]`);
             return;
         }
-        this.logger.debug(`${opt.name} => (${err.name})${err.message}`, JSON.stringify(err.context));
+        this.logger.error(`[${size}] ${(_c = opt.name) !== null && _c !== void 0 ? _c : 'Ignored error'} => [${err.name}: ${err.message}]`, JSON.stringify(err.context));
         throw err;
     }
     /** {@inheritDoc} */
@@ -227,42 +224,6 @@ let CbAdapterService = class CbAdapterService {
         return undefined;
     }
     /** {@inheritDoc} */
-    checkError(p1, p2) {
-        var _a;
-        let op;
-        let err;
-        if (typeof p1 === 'string') {
-            p1 = p1.trim();
-            op = p1 ? `(${p1})` : '';
-            err = p2;
-        }
-        else {
-            op = '';
-            err = p1;
-        }
-        const name = (_a = err === null || err === void 0 ? void 0 : err.constructor) === null || _a === void 0 ? void 0 : _a.name;
-        if (name) {
-            if (!this._cbErrors.has(name)) {
-                this.logger.warn(`!first[${name}] #${op} [1]`, err);
-                this._cbErrors.set(name, { count: 1, log: true });
-            }
-            else {
-                const obj = this._cbErrors.get(name);
-                obj.count++;
-                if (obj.known) {
-                    this.logger.debug(`!known[${name}] #${op} [${obj.count}]`, err);
-                }
-                else {
-                    this.logger.debug(`!unknown[${name}] #${op} [${obj.count}]`, err);
-                }
-            }
-        }
-        else {
-            this._undefined++;
-            this.logger.warn(`!undefined[] #${op} [${this._undefined}]`, err);
-        }
-    }
-    /** {@inheritDoc} */
     createIndex(coll, p1, name) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Array.isArray(p1)) {
@@ -410,7 +371,6 @@ let CbAdapterService = class CbAdapterService {
     /** {@inheritDoc} */
     connectDb() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (this._connected) {
                 return this._cluster;
             }
@@ -426,7 +386,7 @@ let CbAdapterService = class CbAdapterService {
                 return this._cluster;
             }
             catch (e) {
-                this.logger.error(`!connection[${(_a = e.name) !== null && _a !== void 0 ? _a : ''}]`, e);
+                this.logger.warn(`Connection error => [${e.name}: ${e.message}]`);
                 throw e;
             }
         });

package/dist/adapter/index.types.d.ts

@@ -43,14 +43,6 @@ export interface CbAdapterServiceLike {
      * Return first row of rows
      * */
     first<T>(rows: Array<T>): T | undefined;
-    /**
-     * Check error
-     * */
-    checkError(err: Error): void;
-    /**
-     * Check error with operation
-     * */
-    checkError(op: string, err: Error): void;
     /**
      * Create index for multiple fields
      * */

package/dist/repo/cb.repo.d.ts

@@ -1,11 +1,14 @@
 import { CbAdapterService, type CbEntity, type CbExecOpt } from "../adapter";
 import { Bucket, Cluster, Collection, Scope } from "couchbase";
 import type { CbRepoDef, CbRepoLike } from "./index.types";
+import { Logger } from "@nestjs/common";
 export declare abstract class CbRepo<E extends CbEntity, ID> implements CbRepoLike<E, ID> {
     protected colName: string;
     protected cb: CbAdapterService;
     private _scopeName?;
     private _bucketName?;
+    private _tryCount;
+    protected logger: Logger;
     /** @inheritDoc */
     readonly fullPath: string;
     /** @inheritDoc */

package/dist/repo/cb.repo.js

@@ -15,6 +15,7 @@ const common_1 = require("@leyyo/common");
 const config_1 = require("../config");
 const line_1 = require("../line");
 const node_crypto_1 = require("node:crypto");
+const common_2 = require("@nestjs/common");
 let F_ID;
 let F_URN;
 let F_TRASH_ID;
@@ -25,6 +26,8 @@ class CbRepo {
         this.cb = cb;
         this._scopeName = _scopeName;
         this._bucketName = _bucketName;
+        this._tryCount = 0;
+        this.logger = new common_2.Logger(this.constructor.name);
         if (!F_ID) {
             F_ID = this.cb.f('id');
             F_URN = this.cb.f('_urn');
@@ -103,14 +106,25 @@ class CbRepo {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const mutable = this;
-            mutable.cluster = yield this.cb.connectDb();
-            mutable.bucket = this.cluster.bucket((_a = this._bucketName) !== null && _a !== void 0 ? _a : config_1.couchbaseCommonConfig.raw.CB_BUCKET);
-            mutable.scope = this.bucket.scope((_b = this._scopeName) !== null && _b !== void 0 ? _b : config_1.couchbaseCommonConfig.raw.CB_SCOPE);
-            mutable.collection = this.scope.collection(this.colName);
-            mutable.path = `${this.bucket.name}.${this.scope.name}.${this.collection.name}`;
-            mutable.fullPath = this.cb.f(`${this.bucket.name}.${this.scope.name}.${this.collection.name}`);
-            if (config_1.couchbaseCommonConfig.raw.CB_CREATE_INDICES) {
-                yield this._createIndices();
+            try {
+                mutable.cluster = yield this.cb.connectDb();
+                mutable.bucket = this.cluster.bucket((_a = this._bucketName) !== null && _a !== void 0 ? _a : config_1.couchbaseCommonConfig.raw.CB_BUCKET);
+                mutable.scope = this.bucket.scope((_b = this._scopeName) !== null && _b !== void 0 ? _b : config_1.couchbaseCommonConfig.raw.CB_SCOPE);
+                mutable.collection = this.scope.collection(this.colName);
+                mutable.path = `${this.bucket.name}.${this.scope.name}.${this.collection.name}`;
+                mutable.fullPath = this.cb.f(`${this.bucket.name}.${this.scope.name}.${this.collection.name}`);
+                if (config_1.couchbaseCommonConfig.raw.CB_CREATE_INDICES) {
+                    yield this._createIndices();
+                }
+            }
+            catch (e) {
+                if (this._tryCount > 100) {
+                    throw e;
+                }
+                this._tryCount++;
+                setTimeout(() => this.onModuleInit().then().catch(e2 => {
+                    throw e2;
+                }), 1000);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@samet-it/be-couchbase-common",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Couchbase common component",
   "keywords": [
     "Couchbase"