ferrum-db-client - npm Package Compare versions

Comparing version 0.3.12 to 0.3.13

dist/collection_remote.d.ts

 import { CollectionType } from './proto/collection_pb';
-import { ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import { EventEmitter, ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -11,3 +11,3 @@ export declare class CollectionRemote {
     get name(): string;
-    constructor(channel: Channel, type: CollectionType, database: string, collectionkey: string, observerConfig: ObserverConfig);
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, type: CollectionType, database: string, collectionkey: string, observerConfig: ObserverConfig);
     hasTag(tag?: string): Promise<boolean>;
@@ -14,0 +14,0 @@ getTagEntry<T>(tag?: string, encoding?: SupportedEncodingTypes, compression?: SupportedCompressionTypes): Promise<T>;

dist/collection_remote.js

@@ -12,3 +12,10 @@ "use strict";
     }
-    constructor(channel, type, database, collectionkey, observerConfig) {
+    constructor(channel, onReconnect, type, database, collectionkey, observerConfig) {
+        onReconnect.subscribe((ch) => {
+            this.collectionClient = new collection_grpc_pb_1.CollectionClient(ch.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
         this.collectionClient = new collection_grpc_pb_1.CollectionClient(channel.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
@@ -15,0 +22,0 @@ channelFactoryOverride: () => channel,

dist/db_remote.d.ts

 import { IndexRemote } from './index_remote';
 import { SetRemote } from './set_remote';
 import { TimeSeriesRemote } from './time_series_remote';
-import { SupportedCompressionTypes, SupportedEncodingTypes, ObserverConfig } from './util';
+import { SupportedCompressionTypes, SupportedEncodingTypes, ObserverConfig, EventEmitter } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -11,3 +11,4 @@ export declare class FerrumDBRemote {
     private observerConfig;
-    constructor(channel: Channel, dbName: string, observerConfig: ObserverConfig);
+    private onReconnect;
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, dbName: string, observerConfig: ObserverConfig);
     createIndexIfNotExist<T>(index: string, encoding?: SupportedEncodingTypes, compression?: SupportedCompressionTypes, pageFileSize?: number): Promise<IndexRemote<T>>;
@@ -14,0 +15,0 @@ getIndex<T>(index: string, encoding?: SupportedEncodingTypes, compression?: SupportedCompressionTypes): IndexRemote<T>;

dist/db_remote.js

@@ -12,3 +12,12 @@ "use strict";
 class FerrumDBRemote {
-    constructor(channel, dbName, observerConfig) {
+    constructor(channel, onReconnect, dbName, observerConfig) {
+        this.onReconnect = onReconnect;
+        onReconnect.subscribe((ch) => {
+            this.client = new database_grpc_pb_1.DatabaseClient(ch.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+            this.channel = ch;
+        });
         this.channel = channel;
@@ -32,3 +41,3 @@ this.name = dbName;
     getIndex(index, encoding = 'bson', compression = 'gzip') {
-        return new index_remote_1.IndexRemote(this.channel, this.name, index, encoding, compression, this.observerConfig);
+        return new index_remote_1.IndexRemote(this.channel, this.onReconnect, this.name, index, encoding, compression, this.observerConfig);
     }
@@ -85,3 +94,3 @@ async deleteIndex(index) {
     getSet(set) {
-        return new set_remote_1.SetRemote(this.channel, this.name, set, this.observerConfig);
+        return new set_remote_1.SetRemote(this.channel, this.onReconnect, this.name, set, this.observerConfig);
     }
@@ -138,3 +147,3 @@ async deleteSet(set) {
     getTimeSeries(name, encoding = 'bson', compression = 'gzip') {
-        return new time_series_remote_1.TimeSeriesRemote(this.channel, this.name, name, encoding, compression, this.observerConfig);
+        return new time_series_remote_1.TimeSeriesRemote(this.channel, this.onReconnect, this.name, name, encoding, compression, this.observerConfig);
     }
@@ -141,0 +150,0 @@ async deleteTimeSeries(name) {

dist/index_remote.d.ts

 import { CollectionRemote } from './collection_remote';
-import { ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import { EventEmitter, ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -8,3 +8,3 @@ export declare class IndexRemote<T> extends CollectionRemote {
     private client;
-    constructor(channel: Channel, database: string, indexName: string, encoding: SupportedEncodingTypes, compression: SupportedCompressionTypes, observerConfig: ObserverConfig);
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, database: string, indexName: string, encoding: SupportedEncodingTypes, compression: SupportedCompressionTypes, observerConfig: ObserverConfig);
     has(key: string): Promise<boolean>;
@@ -11,0 +11,0 @@ getRecordSize(key: string): Promise<number>;

dist/index_remote.js

@@ -11,4 +11,11 @@ "use strict";
 class IndexRemote extends collection_remote_1.CollectionRemote {
-    constructor(channel, database, indexName, encoding, compression, observerConfig) {
-        super(channel, collection_pb_1.CollectionType.INDEX, database, indexName, observerConfig);
+    constructor(channel, onReconnect, database, indexName, encoding, compression, observerConfig) {
+        super(channel, onReconnect, collection_pb_1.CollectionType.INDEX, database, indexName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new index_grpc_pb_1.IndexClient(ch.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
         this.client = new index_grpc_pb_1.IndexClient(channel.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
@@ -15,0 +22,0 @@ channelFactoryOverride: () => channel,

dist/index.d.ts

 import { FerrumDBRemote } from './db_remote';
 import { DatabaseResponseMetrics, EventEmitter } from './util';
+import { ConnectivityState } from '@grpc/grpc-js/build/src/connectivity-state';
 export { FerrumDBRemote } from './db_remote';
@@ -21,3 +22,5 @@ export { IndexRemote } from './index_remote';
     readonly onTimeout: EventEmitter<string>;
+    private onReconnect;
     private constructor();
+    getChannelStatus(): ConnectivityState;
     setRequestTimeout(timeout: number): void;
@@ -24,0 +27,0 @@ static getFerrumServerClient(ip: string, port: number): FerrumServerClient;

dist/index.js

@@ -48,2 +48,5 @@ "use strict";
     }
+    getChannelStatus() {
+        return this.client.getChannel().getConnectivityState(false);
+    }
     setRequestTimeout(timeout) {
@@ -85,2 +88,3 @@ this.observerConfig.timeout = timeout;
         });
+        this.onReconnect.emit(this.client.getChannel());
     }
@@ -94,3 +98,3 @@ async createDatabaseIfNotExists(dbName) {
         }
-        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -104,3 +108,3 @@ async createDatabase(dbName) {
         }
-        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -112,3 +116,3 @@ async getDatabase(dbName) {
         }
-        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new db_remote_1.FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -115,0 +119,0 @@ async hasDatabase(dbName) {

dist/set_remote.d.ts

 import { CollectionRemote } from './collection_remote';
-import { ObserverConfig } from './util';
+import { EventEmitter, ObserverConfig } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
 export declare class SetRemote extends CollectionRemote {
     private client;
-    constructor(channel: Channel, database: string, setName: string, observerConfig: ObserverConfig);
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, database: string, setName: string, observerConfig: ObserverConfig);
     has(key: string): Promise<boolean>;
@@ -8,0 +8,0 @@ getRecordCount(): Promise<number>;

dist/set_remote.js

@@ -11,4 +11,11 @@ "use strict";
 class SetRemote extends collection_remote_1.CollectionRemote {
-    constructor(channel, database, setName, observerConfig) {
-        super(channel, collection_pb_1.CollectionType.SET, database, setName, observerConfig);
+    constructor(channel, onReconnect, database, setName, observerConfig) {
+        super(channel, onReconnect, collection_pb_1.CollectionType.SET, database, setName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new set_grpc_pb_1.SetClient(ch.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
         this.client = new set_grpc_pb_1.SetClient(channel.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
@@ -15,0 +22,0 @@ channelFactoryOverride: () => channel,

dist/time_series_remote.d.ts

 import { CollectionRemote } from './collection_remote';
-import { ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import { EventEmitter, ObserverConfig, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -8,3 +8,3 @@ export declare class TimeSeriesRemote<T> extends CollectionRemote {
     private client;
-    constructor(channel: Channel, database: string, timeSeriesName: string, encoding: SupportedEncodingTypes, compression: SupportedCompressionTypes, observerConfig: ObserverConfig);
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, database: string, timeSeriesName: string, encoding: SupportedEncodingTypes, compression: SupportedCompressionTypes, observerConfig: ObserverConfig);
     hasSerie(serie: string): Promise<boolean>;
@@ -11,0 +11,0 @@ getEntry(serie: string, timestamp: number): Promise<T | null>;

dist/time_series_remote.js

@@ -11,4 +11,11 @@ "use strict";
 class TimeSeriesRemote extends collection_remote_1.CollectionRemote {
-    constructor(channel, database, timeSeriesName, encoding, compression, observerConfig) {
-        super(channel, collection_pb_1.CollectionType.TIMESERIES, database, timeSeriesName, observerConfig);
+    constructor(channel, onReconnect, database, timeSeriesName, encoding, compression, observerConfig) {
+        super(channel, onReconnect, collection_pb_1.CollectionType.TIMESERIES, database, timeSeriesName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new timeseries_grpc_pb_1.TimeSeriesClient(ch.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
         this.client = new timeseries_grpc_pb_1.TimeSeriesClient(channel.getTarget(), grpc_js_1.ChannelCredentials.createSsl(), {
@@ -15,0 +22,0 @@ channelFactoryOverride: () => channel,

package.json

 {
     "name": "ferrum-db-client",
-    "version": "0.3.12",
+    "version": "0.3.13",
     "main": "dist/index.js",
@@ -5,0 +5,0 @@ "typings": "dist/index.d.ts",

src/collection_remote.ts

 import { ChannelCredentials } from '@grpc/grpc-js';
 import { CollectionClient } from './proto/collection_grpc_pb';
 import { CollectionType, DeleteTagRequest, GetTagRequest, HasTagRequest, ListTagsRequest, SetTagRequest } from './proto/collection_pb';
-import { CallbackReturnType, decodeValue, encodeValue, ObserverConfig, performRPC, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import {
+    CallbackReturnType,
+    decodeValue,
+    encodeValue,
+    EventEmitter,
+    ObserverConfig,
+    performRPC,
+    SupportedCompressionTypes,
+    SupportedEncodingTypes,
+} from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -19,3 +28,18 @@
 
-    constructor(channel: Channel, type: CollectionType, database: string, collectionkey: string, observerConfig: ObserverConfig) {
+    constructor(
+        channel: Channel,
+        onReconnect: EventEmitter<Channel>,
+        type: CollectionType,
+        database: string,
+        collectionkey: string,
+        observerConfig: ObserverConfig,
+    ) {
+        onReconnect.subscribe((ch) => {
+            this.collectionClient = new CollectionClient(ch.getTarget(), ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
+
         this.collectionClient = new CollectionClient(channel.getTarget(), ChannelCredentials.createSsl(), {
@@ -22,0 +46,0 @@ channelFactoryOverride: () => channel,

src/db_remote.ts

@@ -20,3 +20,3 @@ import { ChannelCredentials } from '@grpc/grpc-js';
 import { TimeSeriesRemote } from './time_series_remote';
-import { SupportedCompressionTypes, SupportedEncodingTypes, CallbackReturnType, performRPC, ObserverConfig } from './util';
+import { SupportedCompressionTypes, SupportedEncodingTypes, CallbackReturnType, performRPC, ObserverConfig, EventEmitter } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -29,4 +29,14 @@
     private observerConfig: ObserverConfig;
+    private onReconnect: EventEmitter<Channel>;
 
-    constructor(channel: Channel, dbName: string, observerConfig: ObserverConfig) {
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, dbName: string, observerConfig: ObserverConfig) {
+        this.onReconnect = onReconnect;
+        onReconnect.subscribe((ch) => {
+            this.client = new DatabaseClient(ch.getTarget(), ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+            this.channel = ch;
+        });
         this.channel = channel;
@@ -63,3 +73,3 @@ this.name = dbName;
     public getIndex<T>(index: string, encoding: SupportedEncodingTypes = 'bson', compression: SupportedCompressionTypes = 'gzip'): IndexRemote<T> {
-        return new IndexRemote<T>(this.channel, this.name, index, encoding, compression, this.observerConfig);
+        return new IndexRemote<T>(this.channel, this.onReconnect, this.name, index, encoding, compression, this.observerConfig);
     }
@@ -166,3 +176,3 @@
     public getSet(set: string): SetRemote {
-        return new SetRemote(this.channel, this.name, set, this.observerConfig);
+        return new SetRemote(this.channel, this.onReconnect, this.name, set, this.observerConfig);
     }
@@ -269,3 +279,3 @@
     public getTimeSeries<T>(name: string, encoding: SupportedEncodingTypes = 'bson', compression: SupportedCompressionTypes = 'gzip'): TimeSeriesRemote<T> {
-        return new TimeSeriesRemote<T>(this.channel, this.name, name, encoding, compression, this.observerConfig);
+        return new TimeSeriesRemote<T>(this.channel, this.onReconnect, this.name, name, encoding, compression, this.observerConfig);
     }
@@ -272,0 +282,0 @@

src/index_remote.ts

@@ -16,3 +16,12 @@ import { ChannelCredentials } from '@grpc/grpc-js';
 } from './proto/index_pb';
-import { CallbackReturnType, decodeValue, encodeValue, ObserverConfig, performRPC, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import {
+    CallbackReturnType,
+    decodeValue,
+    encodeValue,
+    EventEmitter,
+    ObserverConfig,
+    performRPC,
+    SupportedCompressionTypes,
+    SupportedEncodingTypes,
+} from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -27,2 +36,3 @@
         channel: Channel,
+        onReconnect: EventEmitter<Channel>,
         database: string,
@@ -34,3 +44,11 @@ indexName: string,
     ) {
-        super(channel, CollectionType.INDEX, database, indexName, observerConfig);
+        super(channel, onReconnect, CollectionType.INDEX, database, indexName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new IndexClient(ch.getTarget(), ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
+
         this.client = new IndexClient(channel.getTarget(), ChannelCredentials.createSsl(), {
@@ -37,0 +55,0 @@ channelFactoryOverride: () => channel,

src/index.ts

 import { ChannelCredentials } from '@grpc/grpc-js';
+import { Channel } from '@grpc/grpc-js/build/src/channel';
 import { FerrumDBRemote } from './db_remote';
@@ -7,2 +8,3 @@ import { DatabaseServerClient } from './proto/database_server_grpc_pb';
 import { CallbackReturnType, DatabaseResponseMetrics, EventEmitter, ObserverConfig, performRPC } from './util';
+import { ConnectivityState } from '@grpc/grpc-js/build/src/connectivity-state';
 
@@ -34,2 +36,3 @@ export { FerrumDBRemote } from './db_remote';
     public readonly onTimeout: EventEmitter<string> = new EventEmitter();
+    private onReconnect: EventEmitter<Channel>;
 
@@ -52,7 +55,11 @@ private constructor(ip: string, port: number) {
 
-    public setRequestTimeout(timeout: number) {
+    public getChannelStatus(): ConnectivityState {
+        return this.client.getChannel().getConnectivityState(false);
+    }
+
+    public setRequestTimeout(timeout: number): void {
         this.observerConfig.timeout = timeout;
     }
 
-    public static getFerrumServerClient(ip: string, port: number) {
+    public static getFerrumServerClient(ip: string, port: number): FerrumServerClient {
         const key = `${ip}:${port}`;
@@ -66,3 +73,3 @@ if (!FerrumServerClient.instanceMap[key]) {
 
-    public static disconnectAll() {
+    public static disconnectAll(): void {
         for (const key of Object.keys(FerrumServerClient.instanceMap)) {
@@ -75,3 +82,3 @@ FerrumServerClient.instanceMap[key].disconnect();
 
-    public async disconnectClient(ip: string, port: number) {
+    public async disconnectClient(ip: string, port: number): Promise<void> {
         const key = `${ip}:${port}`;
@@ -99,2 +106,4 @@ if (FerrumServerClient.instanceMap[key]) {
         });
+
+        this.onReconnect.emit(this.client.getChannel());
     }
@@ -115,3 +124,3 @@
 
-        return new FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -133,3 +142,3 @@
 
-        return new FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -143,3 +152,3 @@
 
-        return new FerrumDBRemote(this.client.getChannel(), dbName, this.observerConfig);
+        return new FerrumDBRemote(this.client.getChannel(), this.onReconnect, dbName, this.observerConfig);
     }
@@ -146,0 +155,0 @@

src/set_remote.ts

@@ -6,3 +6,3 @@ import { ChannelCredentials } from '@grpc/grpc-js';
 import { ClearRequest, DeleteRequest, HasRequest, ListKeysRequest, PutRequest, SizeRequest } from './proto/set_pb';
-import { CallbackReturnType, ObserverConfig, performRPC } from './util';
+import { CallbackReturnType, EventEmitter, ObserverConfig, performRPC } from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -13,4 +13,11 @@
 
-    constructor(channel: Channel, database: string, setName: string, observerConfig: ObserverConfig) {
-        super(channel, CollectionType.SET, database, setName, observerConfig);
+    constructor(channel: Channel, onReconnect: EventEmitter<Channel>, database: string, setName: string, observerConfig: ObserverConfig) {
+        super(channel, onReconnect, CollectionType.SET, database, setName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new SetClient(ch.getTarget(), ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
         this.client = new SetClient(channel.getTarget(), ChannelCredentials.createSsl(), {
@@ -17,0 +24,0 @@ channelFactoryOverride: () => channel,

src/time_series_remote.ts

@@ -26,3 +26,12 @@ import { ChannelCredentials } from '@grpc/grpc-js';
 } from './proto/timeseries_pb';
-import { CallbackReturnType, decodeValue, encodeValue, ObserverConfig, performRPC, SupportedCompressionTypes, SupportedEncodingTypes } from './util';
+import {
+    CallbackReturnType,
+    decodeValue,
+    encodeValue,
+    EventEmitter,
+    ObserverConfig,
+    performRPC,
+    SupportedCompressionTypes,
+    SupportedEncodingTypes,
+} from './util';
 import { Channel } from '@grpc/grpc-js/build/src/channel';
@@ -37,2 +46,3 @@
         channel: Channel,
+        onReconnect: EventEmitter<Channel>,
         database: string,
@@ -44,3 +54,11 @@ timeSeriesName: string,
     ) {
-        super(channel, CollectionType.TIMESERIES, database, timeSeriesName, observerConfig);
+        super(channel, onReconnect, CollectionType.TIMESERIES, database, timeSeriesName, observerConfig);
+        onReconnect.subscribe((ch) => {
+            this.client = new TimeSeriesClient(ch.getTarget(), ChannelCredentials.createSsl(), {
+                channelFactoryOverride: () => ch,
+                'grpc.max_send_message_length': -1,
+                'grpc.max_receive_message_length': -1,
+            });
+        });
+
         this.client = new TimeSeriesClient(channel.getTarget(), ChannelCredentials.createSsl(), {
@@ -47,0 +65,0 @@ channelFactoryOverride: () => channel,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1233136

increased by0.86%

Lines of code

28323

increased by0.45%

No dependency changes