@shopify/shopify-app-session-storage-redis 1.1.0 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,14 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
5
5
  var redis = require('redis');
6
6
 
7
7
  class RedisConnection {
8
- constructor(dbUrl, options, keyPrefix, onError) {
8
+ constructor(dbUrl, options, keyPrefix) {
9
9
  this.sessionStorageIdentifier = void 0;
10
10
  this.client = void 0;
11
+ this.eventHandler = (..._args) => {};
11
12
  this.init(dbUrl, options);
12
13
  this.sessionStorageIdentifier = keyPrefix;
13
- if (onError) {
14
- this.client.on('error', onError);
15
- }
16
14
  }
17
15
  query(_query, _params) {
18
16
  throw new Error('Method not implemented. Use get(string, boolean) instead');
@@ -46,6 +44,10 @@ class RedisConnection {
46
44
  ...options,
47
45
  url: dbUrl
48
46
  });
47
+ this.client.on('error', this.eventHandler);
48
+ this.client.on('connect', this.eventHandler);
49
+ this.client.on('reconnecting', this.eventHandler);
50
+ this.client.on('ready', this.eventHandler);
49
51
  }
50
52
  }
51
53
 
@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
5
5
  var shopifyAppSessionStorage = require('@shopify/shopify-app-session-storage');
6
6
 
7
7
  class RedisSessionStorageMigrator extends shopifyAppSessionStorage.AbstractMigrationEngine {
8
- constructor(dbConnection, opts = {}) {
8
+ constructor(dbConnection, opts = {}, migrations) {
9
9
  // The name has already been decided whith the last migration
10
10
  opts.migrationDBIdentifier = 'migrations';
11
- super(dbConnection, opts);
11
+ super(dbConnection, opts, migrations);
12
12
  }
13
13
  async initMigrationPersistence() {
14
14
  // nothing to do here
@@ -10,8 +10,7 @@ var redisMigrator = require('./redis-migrator.js');
10
10
  const defaultRedisSessionStorageOptions = {
11
11
  sessionKeyPrefix: 'shopify_sessions',
12
12
  migratorOptions: {
13
- migrationDBIdentifier: 'migrations',
14
- migrations: migrations.migrationList
13
+ migrationDBIdentifier: 'migrations'
15
14
  }
16
15
  };
17
16
  class RedisSessionStorage {
@@ -29,7 +28,8 @@ class RedisSessionStorage {
29
28
  ...opts
30
29
  };
31
30
  this.internalInit = this.init(dbUrl.toString());
32
- this.ready = this.initMigrator(this.options.migratorOptions);
31
+ this.migrator = new redisMigrator.RedisSessionStorageMigrator(this.client, this.options.migratorOptions, migrations.migrationList);
32
+ this.ready = this.migrator.applyMigrations(this.internalInit);
33
33
  }
34
34
  async storeSession(session) {
35
35
  await this.ready;
@@ -106,16 +106,6 @@ class RedisSessionStorage {
106
106
  this.client = new redisConnection.RedisConnection(dbUrl, this.options, this.options.sessionKeyPrefix);
107
107
  await this.client.connect();
108
108
  }
109
- async initMigrator(migratorOptions) {
110
- await this.internalInit;
111
- if (migratorOptions === null) {
112
- return Promise.resolve();
113
- } else {
114
- this.migrator = new redisMigrator.RedisSessionStorageMigrator(this.client, migratorOptions);
115
- this.migrator.validateMigrationList(migrations.migrationList);
116
- return this.migrator.applyMigrations();
117
- }
118
- }
119
109
  }
120
110
 
121
111
  exports.RedisSessionStorage = RedisSessionStorage;
@@ -3,7 +3,7 @@ import { DBConnection } from '@shopify/shopify-app-session-storage';
3
3
  export declare class RedisConnection implements DBConnection {
4
4
  sessionStorageIdentifier: string;
5
5
  private client;
6
- constructor(dbUrl: string, options: RedisClientOptions, keyPrefix: string, onError?: (...args: any[]) => void);
6
+ constructor(dbUrl: string, options: RedisClientOptions, keyPrefix: string);
7
7
  query(_query: string, _params: any[]): Promise<any[]>;
8
8
  connect(): Promise<void>;
9
9
  disconnect(): Promise<void>;
@@ -14,5 +14,6 @@ export declare class RedisConnection implements DBConnection {
14
14
  generateFullKey(name: string): string;
15
15
  private buildKey;
16
16
  private init;
17
+ private eventHandler;
17
18
  }
18
19
  //# sourceMappingURL=redis-connection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis-connection.d.ts","sourceRoot":"","sources":["../../src/redis-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,sCAAsC,CAAC;AAIlE,qBAAa,eAAgB,YAAW,YAAY;IAClD,wBAAwB,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,MAAM,CAAc;gBAG1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,kBAAkB,EAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI;IAUpC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAI/C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,UAAO;IAIpD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAIvD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,IAAI;CAMb"}
1
+ {"version":3,"file":"redis-connection.d.ts","sourceRoot":"","sources":["../../src/redis-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACvD,OAAO,EAAC,YAAY,EAAC,MAAM,sCAAsC,CAAC;AAIlE,qBAAa,eAAgB,YAAW,YAAY;IAClD,wBAAwB,EAAE,MAAM,CAAC;IACjC,OAAO,CAAC,MAAM,CAAc;gBAEhB,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM;IAKzE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAI/C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIhC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,UAAO;IAIpD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAIvD,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIrC,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,IAAI;IAYZ,OAAO,CAAC,YAAY,CAA2B;CAChD"}
@@ -4,12 +4,15 @@ exports.RedisConnection = void 0;
4
4
  var tslib_1 = require("tslib");
5
5
  var redis_1 = require("redis");
6
6
  var RedisConnection = /** @class */ (function () {
7
- function RedisConnection(dbUrl, options, keyPrefix, onError) {
7
+ function RedisConnection(dbUrl, options, keyPrefix) {
8
+ this.eventHandler = function () {
9
+ var _args = [];
10
+ for (var _i = 0; _i < arguments.length; _i++) {
11
+ _args[_i] = arguments[_i];
12
+ }
13
+ };
8
14
  this.init(dbUrl, options);
9
15
  this.sessionStorageIdentifier = keyPrefix;
10
- if (onError) {
11
- this.client.on('error', onError);
12
- }
13
16
  }
14
17
  RedisConnection.prototype.query = function (_query, _params) {
15
18
  throw new Error('Method not implemented. Use get(string, boolean) instead');
@@ -77,6 +80,10 @@ var RedisConnection = /** @class */ (function () {
77
80
  };
78
81
  RedisConnection.prototype.init = function (dbUrl, options) {
79
82
  this.client = (0, redis_1.createClient)(tslib_1.__assign(tslib_1.__assign({}, options), { url: dbUrl }));
83
+ this.client.on('error', this.eventHandler);
84
+ this.client.on('connect', this.eventHandler);
85
+ this.client.on('reconnecting', this.eventHandler);
86
+ this.client.on('ready', this.eventHandler);
80
87
  };
81
88
  return RedisConnection;
82
89
  }());
@@ -1 +1 @@
1
- {"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../src/redis-connection.ts"],"names":[],"mappings":";;;;AAAA,+BAAuD;AAKvD;IAIE,yBACE,KAAa,EACb,OAA2B,EAC3B,SAAiB,EACjB,OAAkC;QAElC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1B,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;QAE1C,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SAClC;IACH,CAAC;IAED,+BAAK,GAAL,UAAM,MAAc,EAAE,OAAc;QAClC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAEK,iCAAO,GAAb;;;gBACE,sBAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC;;;KAC9B;IAEK,oCAAU,GAAhB;;;;4BACE,qBAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;wBAAxB,SAAwB,CAAC;;;;;KAC1B;IAEK,8BAAI,GAAV,UAAW,IAAY;;;gBACrB,sBAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC;;;KAC/B;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,KAAU,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;;4BACxD,qBAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,EAAA;;wBAAlE,SAAkE,CAAC;;;;;KACpE;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;gBAC5C,sBAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,EAAC;;;KAC9D;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;gBAC5C,sBAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,EAAC;;;KAC9D;IAED,yCAAe,GAAf,UAAgB,IAAY;QAC1B,OAAO,UAAG,IAAI,CAAC,wBAAwB,cAAI,IAAI,CAAE,CAAC;IACpD,CAAC;IAEO,kCAAQ,GAAhB,UAAiB,OAAe,EAAE,YAAqB;QACrD,OAAO,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,CAAC;IAEO,8BAAI,GAAZ,UAAa,KAAa,EAAE,OAA2B;QACrD,IAAI,CAAC,MAAM,GAAG,IAAA,oBAAY,wCACrB,OAAO,KACV,GAAG,EAAE,KAAK,IACV,CAAC;IACL,CAAC;IACH,sBAAC;AAAD,CAAC,AA5DD,IA4DC;AA5DY,0CAAe"}
1
+ {"version":3,"file":"redis-connection.js","sourceRoot":"","sources":["../../src/redis-connection.ts"],"names":[],"mappings":";;;;AAAA,+BAAuD;AAKvD;IAIE,yBAAY,KAAa,EAAE,OAA2B,EAAE,SAAiB;QAqDjE,iBAAY,GAAG;YAAC,eAAe;iBAAf,UAAe,EAAf,qBAAe,EAAf,IAAe;gBAAf,0BAAe;;QAAM,CAAC,CAAC;QApD7C,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC1B,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;IAC5C,CAAC;IAED,+BAAK,GAAL,UAAM,MAAc,EAAE,OAAc;QAClC,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IAEK,iCAAO,GAAb;;;gBACE,sBAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAC;;;KAC9B;IAEK,oCAAU,GAAhB;;;;4BACE,qBAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;wBAAxB,SAAwB,CAAC;;;;;KAC1B;IAEK,8BAAI,GAAV,UAAW,IAAY;;;gBACrB,sBAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAC;;;KAC/B;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,KAAU,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;;4BACxD,qBAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,EAAA;;wBAAlE,SAAkE,CAAC;;;;;KACpE;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;gBAC5C,sBAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,EAAC;;;KAC9D;IAEK,6BAAG,GAAT,UAAU,OAAe,EAAE,YAAmB;QAAnB,6BAAA,EAAA,mBAAmB;;;gBAC5C,sBAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,EAAC;;;KAC9D;IAED,yCAAe,GAAf,UAAgB,IAAY;QAC1B,OAAO,UAAG,IAAI,CAAC,wBAAwB,cAAI,IAAI,CAAE,CAAC;IACpD,CAAC;IAEO,kCAAQ,GAAhB,UAAiB,OAAe,EAAE,YAAqB;QACrD,OAAO,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,CAAC;IAEO,8BAAI,GAAZ,UAAa,KAAa,EAAE,OAA2B;QACrD,IAAI,CAAC,MAAM,GAAG,IAAA,oBAAY,wCACrB,OAAO,KACV,GAAG,EAAE,KAAK,IACV,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAGH,sBAAC;AAAD,CAAC,AA1DD,IA0DC;AA1DY,0CAAe"}
@@ -1,7 +1,7 @@
1
- import { AbstractMigrationEngine, SessionStorageMigratorOptions } from '@shopify/shopify-app-session-storage';
1
+ import { AbstractMigrationEngine, SessionStorageMigratorOptions, MigrationOperation } from '@shopify/shopify-app-session-storage';
2
2
  import { RedisConnection } from './redis-connection';
3
3
  export declare class RedisSessionStorageMigrator extends AbstractMigrationEngine<RedisConnection, SessionStorageMigratorOptions> {
4
- constructor(dbConnection: RedisConnection, opts?: Partial<SessionStorageMigratorOptions>);
4
+ constructor(dbConnection: RedisConnection, opts: Partial<SessionStorageMigratorOptions> | undefined, migrations: MigrationOperation[]);
5
5
  initMigrationPersistence(): Promise<void>;
6
6
  hasMigrationBeenApplied(migrationName: string): Promise<boolean>;
7
7
  saveAppliedMigration(migrationName: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"redis-migrator.d.ts","sourceRoot":"","sources":["../../src/redis-migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC9B,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,2BAA4B,SAAQ,uBAAuB,CACtE,eAAe,EACf,6BAA6B,CAC9B;gBAEG,YAAY,EAAE,eAAe,EAC7B,IAAI,GAAE,OAAO,CAAC,6BAA6B,CAAM;IAO7C,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKzC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOhE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAYlD,mBAAmB;CAWlC"}
1
+ {"version":3,"file":"redis-migrator.d.ts","sourceRoot":"","sources":["../../src/redis-migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC7B,kBAAkB,EACnB,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,2BAA4B,SAAQ,uBAAuB,CACtE,eAAe,EACf,6BAA6B,CAC9B;gBAEG,YAAY,EAAE,eAAe,EAC7B,IAAI,oDAA6C,EACjD,UAAU,EAAE,kBAAkB,EAAE;IAO5B,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKzC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOhE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAYlD,mBAAmB;CAWlC"}
@@ -5,11 +5,11 @@ var tslib_1 = require("tslib");
5
5
  var shopify_app_session_storage_1 = require("@shopify/shopify-app-session-storage");
6
6
  var RedisSessionStorageMigrator = /** @class */ (function (_super) {
7
7
  tslib_1.__extends(RedisSessionStorageMigrator, _super);
8
- function RedisSessionStorageMigrator(dbConnection, opts) {
8
+ function RedisSessionStorageMigrator(dbConnection, opts, migrations) {
9
9
  if (opts === void 0) { opts = {}; }
10
10
  // The name has already been decided whith the last migration
11
11
  opts.migrationDBIdentifier = 'migrations';
12
- return _super.call(this, dbConnection, opts) || this;
12
+ return _super.call(this, dbConnection, opts, migrations) || this;
13
13
  }
14
14
  RedisSessionStorageMigrator.prototype.initMigrationPersistence = function () {
15
15
  return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -1 +1 @@
1
- {"version":3,"file":"redis-migrator.js","sourceRoot":"","sources":["../../src/redis-migrator.ts"],"names":[],"mappings":";;;;AAAA,oFAG8C;AAI9C;IAAiD,uDAGhD;IACC,qCACE,YAA6B,EAC7B,IAAiD;QAAjD,qBAAA,EAAA,SAAiD;QAEjD,6DAA6D;QAC7D,IAAI,CAAC,qBAAqB,GAAG,YAAY,CAAC;eAC1C,kBAAM,YAAY,EAAE,IAAI,CAAC;IAC3B,CAAC;IAEK,8DAAwB,GAA9B;;;gBACE,qBAAqB;gBACrB,sBAAO,OAAO,CAAC,OAAO,EAAE,EAAC;;;KAC1B;IAEK,6DAAuB,GAA7B,UAA8B,aAAqB;;;;;;4BAC9B,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAA7C,UAAU,GAAG,SAAgC;wBAC7C,KAAK,GAAG,MAAA,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,KAAK,CAAC;wBAErD,sBAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC;;;;KAC/B;IAEK,0DAAoB,GAA1B,UAA2B,aAAqB;;;;;4BAC3B,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAA7C,UAAU,GAAG,SAAgC;wBACnD,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;wBAEpC,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAC/C,CAAC;wBAEF,sBAAO,OAAO,CAAC,OAAO,EAAE,EAAC;;;;KAC1B;IAEa,yDAAmB,GAAjC;;;;;4BAC2B,qBAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAChD,IAAI,CAAC,OAAO,CAAC,qBAAqB,CACnC,EAAA;;wBAFK,gBAAgB,GAAG,SAExB;wBACG,UAAU,GAAyB,IAAI,GAAG,EAAE,CAAC;wBACjD,IAAI,gBAAgB,EAAE;4BACpB,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;yBACpE;wBAED,sBAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAC;;;;KACpC;IACH,kCAAC;AAAD,CAAC,AAhDD,CAAiD,qDAAuB,GAgDvE;AAhDY,kEAA2B"}
1
+ {"version":3,"file":"redis-migrator.js","sourceRoot":"","sources":["../../src/redis-migrator.ts"],"names":[],"mappings":";;;;AAAA,oFAI8C;AAI9C;IAAiD,uDAGhD;IACC,qCACE,YAA6B,EAC7B,IAAiD,EACjD,UAAgC;QADhC,qBAAA,EAAA,SAAiD;QAGjD,6DAA6D;QAC7D,IAAI,CAAC,qBAAqB,GAAG,YAAY,CAAC;eAC1C,kBAAM,YAAY,EAAE,IAAI,EAAE,UAAU,CAAC;IACvC,CAAC;IAEK,8DAAwB,GAA9B;;;gBACE,qBAAqB;gBACrB,sBAAO,OAAO,CAAC,OAAO,EAAE,EAAC;;;KAC1B;IAEK,6DAAuB,GAA7B,UAA8B,aAAqB;;;;;;4BAC9B,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAA7C,UAAU,GAAG,SAAgC;wBAC7C,KAAK,GAAG,MAAA,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,KAAK,CAAC;wBAErD,sBAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC;;;;KAC/B;IAEK,0DAAoB,GAA1B,UAA2B,aAAqB;;;;;4BAC3B,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAA7C,UAAU,GAAG,SAAgC;wBACnD,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;wBAEpC,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAC/C,CAAC;wBAEF,sBAAO,OAAO,CAAC,OAAO,EAAE,EAAC;;;;KAC1B;IAEa,yDAAmB,GAAjC;;;;;4BAC2B,qBAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAChD,IAAI,CAAC,OAAO,CAAC,qBAAqB,CACnC,EAAA;;wBAFK,gBAAgB,GAAG,SAExB;wBACG,UAAU,GAAyB,IAAI,GAAG,EAAE,CAAC;wBACjD,IAAI,gBAAgB,EAAE;4BACpB,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;yBACpE;wBAED,sBAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAC;;;;KACpC;IACH,kCAAC;AAAD,CAAC,AAjDD,CAAiD,qDAAuB,GAiDvE;AAjDY,kEAA2B"}
@@ -23,6 +23,5 @@ export declare class RedisSessionStorage implements SessionStorage {
23
23
  private addKeyToShopList;
24
24
  private removeKeyFromShopList;
25
25
  private init;
26
- private initMigrator;
27
26
  }
28
27
  //# sourceMappingURL=redis.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EACL,cAAc,EACd,6BAA6B,EAE9B,MAAM,sCAAsC,CAAC;AAM9C,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACnC,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD;AASD,qBAAa,mBAAoB,YAAW,cAAc;IACxD,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC;IAY3C,SAAgB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,QAAQ,CAAyB;gBAE7B,KAAK,EAAE,GAAG,EAAE,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM;IAMzD,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAWrD,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAM/C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAI1B,gBAAgB;YAiBhB,qBAAqB;YAgBrB,IAAI;YASJ,YAAY;CAiB3B"}
1
+ {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../src/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EACL,cAAc,EACd,6BAA6B,EAE9B,MAAM,sCAAsC,CAAC;AAM9C,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACpE,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACnC,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD;AAQD,qBAAa,mBAAoB,YAAW,cAAc;IACxD,MAAM,CAAC,eAAe,CACpB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,0BAA0B,CAAC;IAY3C,SAAgB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,QAAQ,CAAyB;gBAE7B,KAAK,EAAE,GAAG,EAAE,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM;IAWzD,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAWhD,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAWrD,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAM/C,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBpD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAI1B,gBAAgB;YAiBhB,qBAAqB;YAgBrB,IAAI;CAQnB"}
package/build/ts/redis.js CHANGED
@@ -10,7 +10,6 @@ var defaultRedisSessionStorageOptions = {
10
10
  sessionKeyPrefix: 'shopify_sessions',
11
11
  migratorOptions: {
12
12
  migrationDBIdentifier: 'migrations',
13
- migrations: migrations_1.migrationList,
14
13
  },
15
14
  };
16
15
  var RedisSessionStorage = /** @class */ (function () {
@@ -18,7 +17,8 @@ var RedisSessionStorage = /** @class */ (function () {
18
17
  if (opts === void 0) { opts = {}; }
19
18
  this.options = tslib_1.__assign(tslib_1.__assign({}, defaultRedisSessionStorageOptions), opts);
20
19
  this.internalInit = this.init(dbUrl.toString());
21
- this.ready = this.initMigrator(this.options.migratorOptions);
20
+ this.migrator = new redis_migrator_1.RedisSessionStorageMigrator(this.client, this.options.migratorOptions, migrations_1.migrationList);
21
+ this.ready = this.migrator.applyMigrations(this.internalInit);
22
22
  }
23
23
  RedisSessionStorage.withCredentials = function (host, db, username, password, opts) {
24
24
  return new RedisSessionStorage(new URL("redis://".concat(encodeURIComponent(username), ":").concat(encodeURIComponent(password), "@").concat(host, "/").concat(db)), opts);
@@ -231,26 +231,6 @@ var RedisSessionStorage = /** @class */ (function () {
231
231
  });
232
232
  });
233
233
  };
234
- RedisSessionStorage.prototype.initMigrator = function (migratorOptions) {
235
- return tslib_1.__awaiter(this, void 0, void 0, function () {
236
- return tslib_1.__generator(this, function (_a) {
237
- switch (_a.label) {
238
- case 0: return [4 /*yield*/, this.internalInit];
239
- case 1:
240
- _a.sent();
241
- if (migratorOptions === null) {
242
- return [2 /*return*/, Promise.resolve()];
243
- }
244
- else {
245
- this.migrator = new redis_migrator_1.RedisSessionStorageMigrator(this.client, migratorOptions);
246
- this.migrator.validateMigrationList(migrations_1.migrationList);
247
- return [2 /*return*/, this.migrator.applyMigrations()];
248
- }
249
- return [2 /*return*/];
250
- }
251
- });
252
- });
253
- };
254
234
  return RedisSessionStorage;
255
235
  }());
256
236
  exports.RedisSessionStorage = RedisSessionStorage;
@@ -1 +1 @@
1
- {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/redis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/redis.ts"],"names":[],"mappings":"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"}