Optionally use one-var payload if present. (#44)

Author: mbleigh

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .tmp
 .npm
+npm-debug.log
 lib
 
 coverage

src/env.ts

@@ -17,6 +17,7 @@ export interface FirebaseEnvData {
 interface FirebaseEnvMetadata {
  version: string;
  reserved?: FirebaseEnvData;
+ latest?: FirebaseEnvData;
 }
 
 export class AbstractEnv implements FirebaseEnv {
@@ -57,6 +58,7 @@ export class RuntimeConfigEnv extends AbstractEnv {
  projectId: string;
  version: string;
  private _custom: FirebaseEnvData;
+ private _customFromMeta: FirebaseEnvData;
  private _reserved: FirebaseEnvData;
  private _merged: FirebaseEnvData;
  private _watching: boolean;
@@ -97,7 +99,7 @@ export class RuntimeConfigEnv extends AbstractEnv {
  this._meta = JSON.parse(response.text);
  this.lastUpdated = response.updateTime;
 
- console.log(`Firebase: detected new environment version ${this.version}, fetching...`);
+ console.log(`Firebase: detected environment version ${this.version}, activating...`);
  this.fetch();
  } else if (response.state === 'DELETED') {
  this._custom = {};
@@ -119,8 +121,10 @@ export class RuntimeConfigEnv extends AbstractEnv {
  }
 
  private fetch(): PromiseLike<FirebaseEnv> {
- return this.fetchVar(this.version).then((data: FirebaseEnvData) => {
- console.log('Firebase: updated environment configuration, now using', this.version);
+ let fetched = Promise.resolve(this._customFromMeta || this.fetchVar(this.version));
+
+ return fetched.then((data: FirebaseEnvData) => {
+ console.log('Firebase: activated environment configuration', this.version);
  this._merged = null;
  this._custom = data || {};
  this._notifyReady();
@@ -158,6 +162,10 @@ export class RuntimeConfigEnv extends AbstractEnv {
  this.version = meta.version || 'v0';
  this._reserved = meta.reserved || {};
  this._merged = null;
+
+ if (meta.latest) {
+ this._customFromMeta = meta.latest;
+ }
  }
 
  get data(): FirebaseEnvData {

test/env.spec.ts

@@ -122,6 +122,15 @@ describe('RuntimeConfigEnv', () => {
  });
  });
 
+ it('should use "latest" from meta if available', () => {
+ nocks.push(mockMetaVariableWatch('example', {version: 'v1', latest: {foo: 'bar', baz: 'qux'}}));
+ mockMetaVariableWatchTimeout('example', 10000);
+ return subject.ready().then(() => {
+ expect(subject.data['foo']).to.equal('bar');
+ expect(subject.data['baz']).to.equal('qux');
+ });
+ });
+
  it('should merge in reserved data returned by meta', () => {
  nocks.push(mockMetaVariableWatch('example', {version: 'v1', reserved: {foo: 'bar'}}));
  nocks.push(mockRCVariableFetch('example', 'v1', {baz: 'qux'}));