@pisell/core 1.1.2 → 1.1.4

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.
Files changed (3) hide show
  1. package/es/indexDB/index.js +59 -19
  2. package/lib/indexDB/index.js +46 -18
  3. package/package.json +1 -1
package/es/indexDB/index.js CHANGED
@@ -75,16 +75,46 @@ var IndexDBManager = /*#__PURE__*/function () {
75
75
  case 2:
76
76
  return _context.abrupt("return", new Promise(function (resolve, reject) {
77
77
  var request = indexedDB.open(_this.dbName, _this.version);
78
- request.onerror = function () {
79
- _this.useIndexDB = false; // 连接失败时降级
80
- resolve(true); // 仍然返回成功，因为可以使用降级方案
78
+ request.onerror = function (event) {
79
+ var _event$target;
80
+ _this.app.logger.addLog({
81
+ type: 'error',
82
+ title: '[ IndexDB ] ERROR',
83
+ metadata: {
84
+ msg: 'DB request error',
85
+ data: event,
86
+ message: event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.error) === null || _event$target === void 0 ? void 0 : _event$target.message
87
+ }
88
+ });
81
89
  };
82
90
  request.onsuccess = function (event) {
83
91
  _this.db = event.target.result;
84
92
  resolve(true);
85
93
  };
94
+ request.onblocked = function () {
95
+ _this.app.logger.addLog({
96
+ type: 'error',
97
+ title: '[ IndexDB ] blocked',
98
+ metadata: {
99
+ msg: 'DB blocked'
100
+ }
101
+ });
102
+ };
103
+ request.onupgradeneeded = function (event) {};
86
104
  request.onupgradeneeded = function (event) {
87
105
  var db = event.target.result;
106
+ db.onerror = function (event) {
107
+ var _event$target2;
108
+ _this.app.logger.addLog({
109
+ type: 'error',
110
+ title: '[ IndexDB ] ERROR',
111
+ metadata: {
112
+ msg: 'DB error',
113
+ data: event,
114
+ message: event === null || event === void 0 || (_event$target2 = event.target) === null || _event$target2 === void 0 || (_event$target2 = _event$target2.error) === null || _event$target2 === void 0 ? void 0 : _event$target2.message
115
+ }
116
+ });
117
+ };
88
118
  _this.stores.forEach(function (store) {
89
119
  if (!db.objectStoreNames.contains(store.name)) {
90
120
  var _store$indexes;
@@ -144,7 +174,7 @@ var IndexDBManager = /*#__PURE__*/function () {
144
174
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
145
175
  while (1) switch (_context2.prev = _context2.next) {
146
176
  case 0:
147
- log = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : true;
177
+ log = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : false;
148
178
  if (this.useIndexDB) {
149
179
  _context2.next = 5;
150
180
  break;
@@ -156,14 +186,24 @@ var IndexDBManager = /*#__PURE__*/function () {
156
186
  return _context2.abrupt("return", data);
157
187
  case 5:
158
188
  uuid = "[ IndexDB ] ADD: - ".concat(storeName, " - ").concat(dayjs().valueOf());
189
+ if (log) {
190
+ this.app.logger.addLog({
191
+ type: 'info',
192
+ title: uuid,
193
+ metadata: {
194
+ msg: '添加数据前',
195
+ data: data
196
+ }
197
+ });
198
+ }
159
199
  return _context2.abrupt("return", new Promise(function (resolve, reject) {
160
200
  if (!_this2.db) {
161
201
  if (log) {
162
202
  _this2.app.logger.addLog({
163
- type: 'info',
203
+ type: 'error',
164
204
  title: uuid,
165
205
  metadata: {
166
- msg: '添加数据前',
206
+ msg: '添加数据前 数据库未连接',
167
207
  data: data
168
208
  }
169
209
  });
@@ -189,7 +229,7 @@ var IndexDBManager = /*#__PURE__*/function () {
189
229
  request.onerror = function () {
190
230
  if (log) {
191
231
  _this2.app.logger.addLog({
192
- type: 'info',
232
+ type: 'error',
193
233
  title: uuid,
194
234
  metadata: {
195
235
  msg: '添加数据失败'
@@ -215,7 +255,7 @@ var IndexDBManager = /*#__PURE__*/function () {
215
255
  var _transaction$error;
216
256
  if (log) {
217
257
  _this2.app.logger.addLog({
218
- type: 'info',
258
+ type: 'error',
219
259
  title: uuid,
220
260
  metadata: {
221
261
  msg: '事务错误'
@@ -227,7 +267,7 @@ var IndexDBManager = /*#__PURE__*/function () {
227
267
  transaction.onabort = function (e) {
228
268
  if (log) {
229
269
  _this2.app.logger.addLog({
230
- type: 'info',
270
+ type: 'error',
231
271
  title: uuid,
232
272
  metadata: {
233
273
  msg: '事务被中止'
@@ -237,7 +277,7 @@ var IndexDBManager = /*#__PURE__*/function () {
237
277
  return reject(new Error('事务被中止'));
238
278
  };
239
279
  }));
240
- case 7:
280
+ case 8:
241
281
  case "end":
242
282
  return _context2.stop();
243
283
  }
@@ -319,7 +359,7 @@ var IndexDBManager = /*#__PURE__*/function () {
319
359
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
320
360
  while (1) switch (_context4.prev = _context4.next) {
321
361
  case 0:
322
- log = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : true;
362
+ log = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : false;
323
363
  uuid = "[ IndexDB ] GET: - ".concat(storeName, " - ").concat(key, " - ").concat(dayjs().valueOf());
324
364
  if (log) {
325
365
  this.app.logger.addLog({
@@ -345,7 +385,7 @@ var IndexDBManager = /*#__PURE__*/function () {
345
385
  if (!_this4.db) {
346
386
  if (log) {
347
387
  _this4.app.logger.addLog({
348
- type: 'info',
388
+ type: 'error',
349
389
  title: uuid,
350
390
  metadata: {
351
391
  msg: '数据库未连接'
@@ -379,7 +419,7 @@ var IndexDBManager = /*#__PURE__*/function () {
379
419
  resolved = true;
380
420
  if (log) {
381
421
  _this4.app.logger.addLog({
382
- type: 'info',
422
+ type: 'error',
383
423
  title: uuid,
384
424
  metadata: {
385
425
  msg: '获取失败'
@@ -403,7 +443,7 @@ var IndexDBManager = /*#__PURE__*/function () {
403
443
  transaction.onerror = function (event) {
404
444
  if (log) {
405
445
  _this4.app.logger.addLog({
406
- type: 'info',
446
+ type: 'error',
407
447
  title: uuid,
408
448
  metadata: {
409
449
  msg: "\u4E8B\u52A1\u9519\u8BEF: ".concat(event.target.error)
@@ -461,7 +501,7 @@ var IndexDBManager = /*#__PURE__*/function () {
461
501
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
462
502
  while (1) switch (_context5.prev = _context5.next) {
463
503
  case 0:
464
- log = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : true;
504
+ log = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
465
505
  if (this.useIndexDB) {
466
506
  _context5.next = 5;
467
507
  break;
@@ -487,7 +527,7 @@ var IndexDBManager = /*#__PURE__*/function () {
487
527
  if (!_this5.db) {
488
528
  if (log) {
489
529
  _this5.app.logger.addLog({
490
- type: 'info',
530
+ type: 'error',
491
531
  title: uuid,
492
532
  metadata: {
493
533
  msg: '数据库未连接'
@@ -517,7 +557,7 @@ var IndexDBManager = /*#__PURE__*/function () {
517
557
  var _request$error2;
518
558
  if (log) {
519
559
  _this5.app.logger.addLog({
520
- type: 'info',
560
+ type: 'error',
521
561
  title: uuid,
522
562
  metadata: {
523
563
  msg: '数据更新失败'
@@ -541,7 +581,7 @@ var IndexDBManager = /*#__PURE__*/function () {
541
581
  transaction.onabort = function (e) {
542
582
  if (log) {
543
583
  _this5.app.logger.addLog({
544
- type: 'info',
584
+ type: 'error',
545
585
  title: uuid,
546
586
  metadata: {
547
587
  msg: '事务被中止'
@@ -554,7 +594,7 @@ var IndexDBManager = /*#__PURE__*/function () {
554
594
  var _transaction$error2;
555
595
  if (log) {
556
596
  _this5.app.logger.addLog({
557
- type: 'info',
597
+ type: 'error',
558
598
  title: uuid,
559
599
  metadata: {
560
600
  msg: '事务错误'
package/lib/indexDB/index.js CHANGED
@@ -70,16 +70,37 @@ var IndexDBManager = class _IndexDBManager {
70
70
  }
71
71
  return new Promise((resolve, reject) => {
72
72
  const request = indexedDB.open(this.dbName, this.version);
73
- request.onerror = () => {
74
- this.useIndexDB = false;
75
- resolve(true);
73
+ request.onerror = (event) => {
74
+ var _a, _b;
75
+ this.app.logger.addLog({
76
+ type: "error",
77
+ title: "[ IndexDB ] ERROR",
78
+ metadata: { msg: "DB request error", data: event, message: (_b = (_a = event == null ? void 0 : event.target) == null ? void 0 : _a.error) == null ? void 0 : _b.message }
79
+ });
76
80
  };
77
81
  request.onsuccess = (event) => {
78
82
  this.db = event.target.result;
79
83
  resolve(true);
80
84
  };
85
+ request.onblocked = () => {
86
+ this.app.logger.addLog({
87
+ type: "error",
88
+ title: "[ IndexDB ] blocked",
89
+ metadata: { msg: "DB blocked" }
90
+ });
91
+ };
92
+ request.onupgradeneeded = (event) => {
93
+ };
81
94
  request.onupgradeneeded = (event) => {
82
95
  const db = event.target.result;
96
+ db.onerror = (event2) => {
97
+ var _a, _b;
98
+ this.app.logger.addLog({
99
+ type: "error",
100
+ title: "[ IndexDB ] ERROR",
101
+ metadata: { msg: "DB error", data: event2, message: (_b = (_a = event2 == null ? void 0 : event2.target) == null ? void 0 : _a.error) == null ? void 0 : _b.message }
102
+ });
103
+ };
83
104
  this.stores.forEach((store) => {
84
105
  var _a;
85
106
  if (!db.objectStoreNames.contains(store.name)) {
@@ -110,7 +131,7 @@ var IndexDBManager = class _IndexDBManager {
110
131
  * @returns {Promise<T>} 添加的数据
111
132
  * @template T
112
133
  */
113
- async add(storeName, data, log = true) {
134
+ async add(storeName, data, log = false) {
114
135
  var _a;
115
136
  if (!this.useIndexDB) {
116
137
  const key = this.getStorageKey(storeName, data[((_a = this.stores.find((s) => s.name === storeName)) == null ? void 0 : _a.keyPath) || "id"]);
@@ -118,13 +139,20 @@ var IndexDBManager = class _IndexDBManager {
118
139
  return data;
119
140
  }
120
141
  const uuid = `[ IndexDB ] ADD: - ${storeName} - ${(0, import_dayjs.default)().valueOf()}`;
142
+ if (log) {
143
+ this.app.logger.addLog({
144
+ type: "info",
145
+ title: uuid,
146
+ metadata: { msg: "添加数据前", data }
147
+ });
148
+ }
121
149
  return new Promise((resolve, reject) => {
122
150
  if (!this.db) {
123
151
  if (log) {
124
152
  this.app.logger.addLog({
125
- type: "info",
153
+ type: "error",
126
154
  title: uuid,
127
- metadata: { msg: "添加数据前", data }
155
+ metadata: { msg: "添加数据前 数据库未连接", data }
128
156
  });
129
157
  }
130
158
  reject(new Error("数据库未连接"));
@@ -146,7 +174,7 @@ var IndexDBManager = class _IndexDBManager {
146
174
  request.onerror = () => {
147
175
  if (log) {
148
176
  this.app.logger.addLog({
149
- type: "info",
177
+ type: "error",
150
178
  title: uuid,
151
179
  metadata: { msg: "添加数据失败" }
152
180
  });
@@ -167,7 +195,7 @@ var IndexDBManager = class _IndexDBManager {
167
195
  transaction.onerror = (e) => {
168
196
  if (log) {
169
197
  this.app.logger.addLog({
170
- type: "info",
198
+ type: "error",
171
199
  title: uuid,
172
200
  metadata: { msg: "事务错误" }
173
201
  });
@@ -177,7 +205,7 @@ var IndexDBManager = class _IndexDBManager {
177
205
  transaction.onabort = (e) => {
178
206
  if (log) {
179
207
  this.app.logger.addLog({
180
- type: "info",
208
+ type: "error",
181
209
  title: uuid,
182
210
  metadata: { msg: "事务被中止" }
183
211
  });
@@ -217,7 +245,7 @@ var IndexDBManager = class _IndexDBManager {
217
245
  * @returns {Promise<T|null>} 获取的数据，不存在则返回 null
218
246
  * @template T
219
247
  */
220
- async get(storeName, key, log = true) {
248
+ async get(storeName, key, log = false) {
221
249
  const uuid = `[ IndexDB ] GET: - ${storeName} - ${key} - ${(0, import_dayjs.default)().valueOf()}`;
222
250
  if (log) {
223
251
  this.app.logger.addLog({
@@ -238,7 +266,7 @@ var IndexDBManager = class _IndexDBManager {
238
266
  if (!this.db) {
239
267
  if (log) {
240
268
  this.app.logger.addLog({
241
- type: "info",
269
+ type: "error",
242
270
  title: uuid,
243
271
  metadata: { msg: "数据库未连接" }
244
272
  });
@@ -266,7 +294,7 @@ var IndexDBManager = class _IndexDBManager {
266
294
  resolved = true;
267
295
  if (log) {
268
296
  this.app.logger.addLog({
269
- type: "info",
297
+ type: "error",
270
298
  title: uuid,
271
299
  metadata: { msg: "获取失败" }
272
300
  });
@@ -286,7 +314,7 @@ var IndexDBManager = class _IndexDBManager {
286
314
  transaction.onerror = (event) => {
287
315
  if (log) {
288
316
  this.app.logger.addLog({
289
- type: "info",
317
+ type: "error",
290
318
  title: uuid,
291
319
  metadata: { msg: `事务错误: ${event.target.error}` }
292
320
  });
@@ -315,7 +343,7 @@ var IndexDBManager = class _IndexDBManager {
315
343
  * @returns {Promise<T>} 更新后的数据
316
344
  * @template T
317
345
  */
318
- async update(storeName, data, log = true) {
346
+ async update(storeName, data, log = false) {
319
347
  var _a;
320
348
  if (!this.useIndexDB) {
321
349
  const key = this.getStorageKey(storeName, data[((_a = this.stores.find((s) => s.name === storeName)) == null ? void 0 : _a.keyPath) || "id"]);
@@ -334,7 +362,7 @@ var IndexDBManager = class _IndexDBManager {
334
362
  if (!this.db) {
335
363
  if (log) {
336
364
  this.app.logger.addLog({
337
- type: "info",
365
+ type: "error",
338
366
  title: uuid,
339
367
  metadata: { msg: "数据库未连接" }
340
368
  });
@@ -359,7 +387,7 @@ var IndexDBManager = class _IndexDBManager {
359
387
  request.onerror = () => {
360
388
  if (log) {
361
389
  this.app.logger.addLog({
362
- type: "info",
390
+ type: "error",
363
391
  title: uuid,
364
392
  metadata: { msg: "数据更新失败" }
365
393
  });
@@ -379,7 +407,7 @@ var IndexDBManager = class _IndexDBManager {
379
407
  transaction.onabort = (e) => {
380
408
  if (log) {
381
409
  this.app.logger.addLog({
382
- type: "info",
410
+ type: "error",
383
411
  title: uuid,
384
412
  metadata: { msg: "事务被中止" }
385
413
  });
@@ -389,7 +417,7 @@ var IndexDBManager = class _IndexDBManager {
389
417
  transaction.onerror = (e) => {
390
418
  if (log) {
391
419
  this.app.logger.addLog({
392
- type: "info",
420
+ type: "error",
393
421
  title: uuid,
394
422
  metadata: { msg: "事务错误" }
395
423
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/core",
3
- "version": "1.1.2",
3
+ "version": "1.1.4",
4
4
  "sideEffects": false,
5
5
  "main": "./lib/index.js",
6
6
  "module": "./es/index.js",