@openfeature/flagd-provider 0.10.1 → 0.10.3

package/index.cjs.js

@@ -5829,6 +5829,21 @@ function isSet$1(value) {
     return value !== null && value !== undefined;
 }
 
+const closeStreamIfDefined = (stream) => {
+    /**
+     * cancel() is necessary to prevent calls from hanging the process, so we need to we need to remove all the
+     * handlers, and add a no-op for 'error' so we can cancel without bubbling up an exception
+     */
+    if (stream) {
+        stream.removeAllListeners();
+        stream.on('error', () => {
+            // swallow errors after closed
+        });
+        stream.cancel();
+        stream.destroy();
+    }
+};
+
 class GRPCService {
     get _cacheActive() {
         // the cache is "active" (able to be used) if the config enabled it, AND the gRPC stream is live
@@ -5866,10 +5881,8 @@ class GRPCService {
         return new Promise((resolve, reject) => this.listen(reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
     }
     disconnect() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            // cancel the stream and close the connection
-            (_a = this._eventStream) === null || _a === void 0 ? void 0 : _a.cancel();
+            closeStreamIfDefined(this._eventStream);
             this._client.close();
         });
     }
@@ -5896,6 +5909,8 @@ class GRPCService {
     listen(reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
         var _a;
         (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${FlagdProvider.name}: connecting stream...`);
+        // close the previous stream if we're reconnecting
+        closeStreamIfDefined(this._eventStream);
         const stream = this._client.eventStream({}, {});
         stream.on('error', (err) => {
             rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(err);
@@ -6349,16 +6364,16 @@ class GrpcFetch {
         this._request = { providerId: '', selector: selector ? selector : '' };
     }
     connect(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback) {
-        // note that we never reject the promise as sync is a long-running operation
         return new Promise((resolve, reject) => this.listen(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
     }
     disconnect() {
-        var _a, _b;
+        var _a;
         (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug('Disconnecting gRPC sync connection');
-        (_b = this._syncStream) === null || _b === void 0 ? void 0 : _b.destroy();
+        closeStreamIfDefined(this._syncStream);
         this._syncClient.close();
     }
     listen(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
+        closeStreamIfDefined(this._syncStream);
         this._syncStream = this._syncClient.syncFlags(this._request);
         this._syncStream.on('data', (data) => {
             var _a;
@@ -6391,7 +6406,8 @@ class GrpcFetch {
 
 class InProcessService {
     constructor(config, dataFetcher, logger) {
-        this._flagdCore = new flagdCore.FlagdCore();
+        this.logger = logger;
+        this._flagdCore = new flagdCore.FlagdCore(undefined, logger);
         this._dataFetcher = dataFetcher ? dataFetcher : new GrpcFetch(config, undefined, logger);
     }
     connect(reconnectCallback, changedCallback, disconnectCallback) {
@@ -6415,7 +6431,13 @@ class InProcessService {
         return Promise.resolve(this._flagdCore.resolveObjectEvaluation(flagKey, defaultValue, context, logger));
     }
     fill(flags) {
-        this._flagdCore.setConfigurations(flags);
+        var _a;
+        try {
+            this._flagdCore.setConfigurations(flags);
+        }
+        catch (err) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error(err);
+        }
     }
 }
 

package/index.esm.js

@@ -5825,6 +5825,21 @@ function isSet$1(value) {
     return value !== null && value !== undefined;
 }
 
+const closeStreamIfDefined = (stream) => {
+    /**
+     * cancel() is necessary to prevent calls from hanging the process, so we need to we need to remove all the
+     * handlers, and add a no-op for 'error' so we can cancel without bubbling up an exception
+     */
+    if (stream) {
+        stream.removeAllListeners();
+        stream.on('error', () => {
+            // swallow errors after closed
+        });
+        stream.cancel();
+        stream.destroy();
+    }
+};
+
 class GRPCService {
     get _cacheActive() {
         // the cache is "active" (able to be used) if the config enabled it, AND the gRPC stream is live
@@ -5862,10 +5877,8 @@ class GRPCService {
         return new Promise((resolve, reject) => this.listen(reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
     }
     disconnect() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            // cancel the stream and close the connection
-            (_a = this._eventStream) === null || _a === void 0 ? void 0 : _a.cancel();
+            closeStreamIfDefined(this._eventStream);
             this._client.close();
         });
     }
@@ -5892,6 +5905,8 @@ class GRPCService {
     listen(reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
         var _a;
         (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`${FlagdProvider.name}: connecting stream...`);
+        // close the previous stream if we're reconnecting
+        closeStreamIfDefined(this._eventStream);
         const stream = this._client.eventStream({}, {});
         stream.on('error', (err) => {
             rejectConnect === null || rejectConnect === void 0 ? void 0 : rejectConnect(err);
@@ -6345,16 +6360,16 @@ class GrpcFetch {
         this._request = { providerId: '', selector: selector ? selector : '' };
     }
     connect(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback) {
-        // note that we never reject the promise as sync is a long-running operation
         return new Promise((resolve, reject) => this.listen(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback, resolve, reject));
     }
     disconnect() {
-        var _a, _b;
+        var _a;
         (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug('Disconnecting gRPC sync connection');
-        (_b = this._syncStream) === null || _b === void 0 ? void 0 : _b.destroy();
+        closeStreamIfDefined(this._syncStream);
         this._syncClient.close();
     }
     listen(dataFillCallback, reconnectCallback, changedCallback, disconnectCallback, resolveConnect, rejectConnect) {
+        closeStreamIfDefined(this._syncStream);
         this._syncStream = this._syncClient.syncFlags(this._request);
         this._syncStream.on('data', (data) => {
             var _a;
@@ -6387,7 +6402,8 @@ class GrpcFetch {
 
 class InProcessService {
     constructor(config, dataFetcher, logger) {
-        this._flagdCore = new FlagdCore();
+        this.logger = logger;
+        this._flagdCore = new FlagdCore(undefined, logger);
         this._dataFetcher = dataFetcher ? dataFetcher : new GrpcFetch(config, undefined, logger);
     }
     connect(reconnectCallback, changedCallback, disconnectCallback) {
@@ -6411,7 +6427,13 @@ class InProcessService {
         return Promise.resolve(this._flagdCore.resolveObjectEvaluation(flagKey, defaultValue, context, logger));
     }
     fill(flags) {
-        this._flagdCore.setConfigurations(flags);
+        var _a;
+        try {
+            this._flagdCore.setConfigurations(flags);
+        }
+        catch (err) {
+            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error(err);
+        }
     }
 }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@openfeature/flagd-provider",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "scripts": {
     "publish-if-not-exists": "cp $NPM_CONFIG_USERCONFIG .npmrc && if [ \"$(npm show $npm_package_name@$npm_package_version version)\" = \"$(npm run current-version -s)\" ]; then echo 'already published, skipping'; else npm publish --access public; fi",
     "current-version": "echo $npm_package_version"
   },
   "dependencies": {
-    "@openfeature/flagd-core": ">=0.1.3",
+    "@openfeature/flagd-core": "~0.1.4",
     "@protobuf-ts/runtime-rpc": "2.9.0",
     "lru-cache": "10.0.1",
     "util": "0.12.5"

package/src/e2e/jest.config.d.ts

@@ -7,6 +7,5 @@ declare const _default: {
     moduleNameMapper: {
         '@openfeature/flagd-core': string[];
     };
-    globalTeardown: string;
 };
 export default _default;

package/src/lib/service/common/grpc-util.d.ts

@@ -0,0 +1,2 @@
+import { ClientReadableStream } from '@grpc/grpc-js';
+export declare const closeStreamIfDefined: (stream: ClientReadableStream<unknown> | undefined) => void;

package/src/lib/service/common/index.d.ts

@@ -0,0 +1 @@
+export * from './grpc-util';

package/src/lib/service/in-process/in-process-service.d.ts

@@ -3,9 +3,10 @@ import { EvaluationContext, JsonValue, Logger, ResolutionDetails } from '@openfe
 import { Config } from '../../configuration';
 import { DataFetch } from './data-fetch';
 export declare class InProcessService implements Service {
+    private logger?;
     private _flagdCore;
     private _dataFetcher;
-    constructor(config: Config, dataFetcher?: DataFetch, logger?: Logger);
+    constructor(config: Config, dataFetcher?: DataFetch, logger?: Logger | undefined);
     connect(reconnectCallback: () => void, changedCallback: (flagsChanged: string[]) => void, disconnectCallback: () => void): Promise<void>;
     disconnect(): Promise<void>;
     resolveBoolean(flagKey: string, defaultValue: boolean, context: EvaluationContext, logger: Logger): Promise<ResolutionDetails<boolean>>;

package/src/e2e/tear-down.d.ts

@@ -1,2 +0,0 @@
-declare const tearDownTests: () => Promise<void>;
-export default tearDownTests;