@opensumi/ide-storage 2.18.13 → 2.19.1
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.
- package/lib/browser/storage.contribution.d.ts +3 -0
- package/lib/browser/storage.contribution.d.ts.map +1 -1
- package/lib/browser/storage.contribution.js +32 -2
- package/lib/browser/storage.contribution.js.map +1 -1
- package/lib/browser/storage.d.ts +10 -7
- package/lib/browser/storage.d.ts.map +1 -1
- package/lib/browser/storage.js +66 -17
- package/lib/browser/storage.js.map +1 -1
- package/lib/browser/storage.service.d.ts +4 -1
- package/lib/browser/storage.service.d.ts.map +1 -1
- package/lib/browser/storage.service.js +18 -1
- package/lib/browser/storage.service.js.map +1 -1
- package/package.json +6 -6
|
@@ -4,8 +4,11 @@ export declare class DatabaseStorageContribution implements StorageResolverContr
|
|
|
4
4
|
private globalStorage;
|
|
5
5
|
private appConfig;
|
|
6
6
|
private workspaceService;
|
|
7
|
+
private injector;
|
|
8
|
+
private globalLocalStorage;
|
|
7
9
|
storage: IStorage;
|
|
8
10
|
resolve(storageId: URI): Promise<IStorage | undefined>;
|
|
11
|
+
isBuiltinStorage(storageId: URI): boolean;
|
|
9
12
|
onReconnect(): void;
|
|
10
13
|
}
|
|
11
14
|
//# sourceMappingURL=storage.contribution.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/storage.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,2BAA2B,EAC3B,GAAG,EACH,QAAQ,EACR,qBAAqB,
|
|
1
|
+
{"version":3,"file":"storage.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/storage.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,2BAA2B,EAC3B,GAAG,EACH,QAAQ,EACR,qBAAqB,EAMtB,MAAM,4BAA4B,CAAC;AAOpC,qBACa,2BAA4B,YAAW,2BAA2B,EAAE,qBAAqB;IAEpG,OAAO,CAAC,gBAAgB,CAAiB;IAGzC,OAAO,CAAC,aAAa,CAAiB;IAGtC,OAAO,CAAC,SAAS,CAAY;IAG7B,OAAO,CAAC,gBAAgB,CAAoB;IAG5C,OAAO,CAAC,QAAQ,CAAW;IAG3B,OAAO,CAAC,kBAAkB,CAA8B;IAExD,OAAO,EAAE,QAAQ,CAAC;IAEZ,OAAO,CAAC,SAAS,EAAE,GAAG;IAyC5B,gBAAgB,CAAC,SAAS,EAAE,GAAG;IAU/B,WAAW;CAKZ"}
|
|
@@ -9,13 +9,26 @@ const common_1 = require("../common");
|
|
|
9
9
|
const storage_1 = require("./storage");
|
|
10
10
|
let DatabaseStorageContribution = class DatabaseStorageContribution {
|
|
11
11
|
async resolve(storageId) {
|
|
12
|
+
var _a;
|
|
12
13
|
const storageName = storageId.path.toString();
|
|
13
14
|
let storage;
|
|
15
|
+
await this.workspaceService.whenReady;
|
|
14
16
|
if (storageId.scheme === ide_core_browser_1.STORAGE_SCHEMA.SCOPE) {
|
|
15
|
-
|
|
17
|
+
let scopedLocalStorage;
|
|
18
|
+
// 如果是内置的 Storage，在初始化过程中采用 ScopedBrowserStorageService 代理
|
|
19
|
+
if (this.isBuiltinStorage(storageId)) {
|
|
20
|
+
scopedLocalStorage = this.injector.get(ide_core_browser_1.ScopedBrowserStorageService, [(_a = this.workspaceService.workspace) === null || _a === void 0 ? void 0 : _a.uri]);
|
|
21
|
+
}
|
|
22
|
+
storage = new storage_1.Storage(this.workspaceStorage, this.workspaceService, this.appConfig, storageName, scopedLocalStorage);
|
|
16
23
|
}
|
|
17
24
|
else if (storageId.scheme === ide_core_browser_1.STORAGE_SCHEMA.GLOBAL) {
|
|
18
|
-
|
|
25
|
+
if (this.isBuiltinStorage(storageId)) {
|
|
26
|
+
// 如果是内置的 Storage，在初始化过程中采用 GlobalBrowserStorageService 代理
|
|
27
|
+
storage = new storage_1.Storage(this.globalStorage, this.workspaceService, this.appConfig, storageName, this.globalLocalStorage);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
storage = new storage_1.Storage(this.globalStorage, this.workspaceService, this.appConfig, storageName);
|
|
31
|
+
}
|
|
19
32
|
}
|
|
20
33
|
else {
|
|
21
34
|
return;
|
|
@@ -25,6 +38,15 @@ let DatabaseStorageContribution = class DatabaseStorageContribution {
|
|
|
25
38
|
this.storage = storage;
|
|
26
39
|
return storage;
|
|
27
40
|
}
|
|
41
|
+
isBuiltinStorage(storageId) {
|
|
42
|
+
const keys = Object.keys(ide_core_browser_1.STORAGE_NAMESPACE);
|
|
43
|
+
for (const key of keys) {
|
|
44
|
+
if (storageId.isEqual(ide_core_browser_1.STORAGE_NAMESPACE[key])) {
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
28
50
|
onReconnect() {
|
|
29
51
|
if (this.storage) {
|
|
30
52
|
this.storage.reConnectInit();
|
|
@@ -47,6 +69,14 @@ tslib_1.__decorate([
|
|
|
47
69
|
(0, di_1.Autowired)(ide_workspace_1.IWorkspaceService),
|
|
48
70
|
tslib_1.__metadata("design:type", Object)
|
|
49
71
|
], DatabaseStorageContribution.prototype, "workspaceService", void 0);
|
|
72
|
+
tslib_1.__decorate([
|
|
73
|
+
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
74
|
+
tslib_1.__metadata("design:type", di_1.Injector)
|
|
75
|
+
], DatabaseStorageContribution.prototype, "injector", void 0);
|
|
76
|
+
tslib_1.__decorate([
|
|
77
|
+
(0, di_1.Autowired)(ide_core_browser_1.GlobalBrowserStorageService),
|
|
78
|
+
tslib_1.__metadata("design:type", ide_core_browser_1.GlobalBrowserStorageService)
|
|
79
|
+
], DatabaseStorageContribution.prototype, "globalLocalStorage", void 0);
|
|
50
80
|
DatabaseStorageContribution = tslib_1.__decorate([
|
|
51
81
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.StorageResolverContribution, ide_core_browser_1.ClientAppContribution)
|
|
52
82
|
], DatabaseStorageContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.contribution.js","sourceRoot":"","sources":["../../src/browser/storage.contribution.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"storage.contribution.js","sourceRoot":"","sources":["../../src/browser/storage.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAmE;AACnE,iEAWoC;AACpC,2DAA4D;AAE5D,sCAA0F;AAE1F,uCAAoC;AAGpC,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAqBtC,KAAK,CAAC,OAAO,CAAC,SAAc;;QAC1B,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,OAAiB,CAAC;QACtB,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;QACtC,IAAI,SAAS,CAAC,MAAM,KAAK,iCAAc,CAAC,KAAK,EAAE;YAC7C,IAAI,kBAAkB,CAAC;YACvB,0DAA0D;YAC1D,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;gBACpC,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,8CAA2B,EAAE,CAAC,MAAA,IAAI,CAAC,gBAAgB,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,CAAC;aAC7G;YACD,OAAO,GAAG,IAAI,iBAAO,CACnB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,WAAW,EACX,kBAAkB,CACnB,CAAC;SACH;aAAM,IAAI,SAAS,CAAC,MAAM,KAAK,iCAAc,CAAC,MAAM,EAAE;YACrD,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;gBACpC,0DAA0D;gBAC1D,OAAO,GAAG,IAAI,iBAAO,CACnB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,SAAS,EACd,WAAW,EACX,IAAI,CAAC,kBAAkB,CACxB,CAAC;aACH;iBAAM;gBACL,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;aAC/F;SACF;aAAM;YACL,OAAO;SACR;QACD,gBAAgB;QAChB,MAAM,OAAO,CAAC,SAAS,CAAC;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,gBAAgB,CAAC,SAAc;QAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,oCAAiB,CAAC,CAAC;QAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,SAAS,CAAC,OAAO,CAAC,oCAAiB,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC7C,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW;QACT,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;SAC9B;IACH,CAAC;CACF,CAAA;AA3EC;IADC,IAAA,cAAS,EAAC,gCAAuB,CAAC;;qEACM;AAGzC;IADC,IAAA,cAAS,EAAC,6BAAoB,CAAC;;kEACM;AAGtC;IADC,IAAA,cAAS,EAAC,4BAAS,CAAC;;8DACQ;AAG7B;IADC,IAAA,cAAS,EAAC,iCAAiB,CAAC;;qEACe;AAG5C;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACR,aAAQ;6DAAC;AAG3B;IADC,IAAA,cAAS,EAAC,8CAA2B,CAAC;sCACX,8CAA2B;uEAAC;AAjB7C,2BAA2B;IADvC,IAAA,yBAAM,EAAC,8CAA2B,EAAE,wCAAqB,CAAC;GAC9C,2BAA2B,CA6EvC;AA7EY,kEAA2B"}
|
package/lib/browser/storage.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AppConfig } from '@opensumi/ide-core-browser';
|
|
1
|
+
import { AppConfig, StorageService } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { IStorage, Event } from '@opensumi/ide-core-common';
|
|
3
3
|
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
4
4
|
import { IStorageServer } from '../common';
|
|
@@ -6,7 +6,8 @@ export declare class Storage implements IStorage {
|
|
|
6
6
|
private readonly database;
|
|
7
7
|
private readonly workspace;
|
|
8
8
|
private readonly appConfig;
|
|
9
|
-
private readonly
|
|
9
|
+
private readonly storageName;
|
|
10
|
+
private readonly browserLocalStorage?;
|
|
10
11
|
private static readonly DEFAULT_FLUSH_DELAY;
|
|
11
12
|
private _onDidChangeStorage;
|
|
12
13
|
readonly onDidChangeStorage: Event<string>;
|
|
@@ -16,16 +17,17 @@ export declare class Storage implements IStorage {
|
|
|
16
17
|
private pendingDeletes;
|
|
17
18
|
private pendingInserts;
|
|
18
19
|
private toDisposableCollection;
|
|
19
|
-
private
|
|
20
|
-
private
|
|
21
|
-
|
|
20
|
+
private readonly logger;
|
|
21
|
+
private readyDeferred;
|
|
22
|
+
private whenReadyToWriteDeferred;
|
|
23
|
+
constructor(database: IStorageServer, workspace: IWorkspaceService, appConfig: AppConfig, storageName: string, browserLocalStorage?: StorageService | undefined);
|
|
22
24
|
get whenReady(): Promise<void>;
|
|
25
|
+
get whenReadyToWrite(): Promise<void>;
|
|
23
26
|
get items(): Map<string, string>;
|
|
24
27
|
get size(): number;
|
|
25
28
|
init(storageName: string): Promise<void>;
|
|
26
29
|
setup(storageName: string): void;
|
|
27
30
|
reConnectInit(): Promise<void>;
|
|
28
|
-
private jsonToMap;
|
|
29
31
|
dispose(): void;
|
|
30
32
|
get(key: string, fallbackValue: string): string;
|
|
31
33
|
get(key: string, fallbackValue?: string): string | undefined;
|
|
@@ -37,6 +39,7 @@ export declare class Storage implements IStorage {
|
|
|
37
39
|
delete(key: string): Promise<void>;
|
|
38
40
|
close(): Promise<void>;
|
|
39
41
|
private flushPending;
|
|
40
|
-
mapToJson
|
|
42
|
+
private mapToJson;
|
|
43
|
+
private jsonToMap;
|
|
41
44
|
}
|
|
42
45
|
//# sourceMappingURL=storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/browser/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/browser/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAEL,QAAQ,EAIR,KAAK,EAGN,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAkB,MAAM,WAAW,CAAC;AAQ3D,qBAAa,OAAQ,YAAW,QAAQ;IAsBpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;IAzBvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAElD,OAAO,CAAC,mBAAmB,CAAyB;IACpD,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAkC;IAE5E,OAAO,CAAC,YAAY,CAAyB;IAE7C,OAAO,CAAC,KAAK,CAAqB;IAElC,OAAO,CAAC,KAAK,CAAkD;IAE/D,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,cAAc,CAAkC;IAExD,OAAO,CAAC,sBAAsB,CAAoD;IAClF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAE3C,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,wBAAwB,CAAwB;gBAGrC,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,iBAAiB,EAC5B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,MAAM,EACnB,mBAAmB,CAAC,4BAAgB;IAYvD,IAAI,SAAS,kBAEZ;IAED,IAAI,gBAAgB,kBAEnB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAE/B;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAEK,IAAI,CAAC,WAAW,EAAE,MAAM;IA+B9B,KAAK,CAAC,WAAW,EAAE,MAAM;IAInB,aAAa;IAKnB,OAAO;IAIP,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM;IAC/C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAc5D,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO;IACxD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IAWrE,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM;IACrD,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAWlE,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B7F,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBd,YAAY;IAgC1B,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,SAAS;CAelB"}
|
package/lib/browser/storage.js
CHANGED
|
@@ -9,11 +9,12 @@ var StorageState;
|
|
|
9
9
|
StorageState[StorageState["Closed"] = 2] = "Closed";
|
|
10
10
|
})(StorageState || (StorageState = {}));
|
|
11
11
|
class Storage {
|
|
12
|
-
constructor(database, workspace, appConfig, storageName,
|
|
12
|
+
constructor(database, workspace, appConfig, storageName, browserLocalStorage) {
|
|
13
13
|
this.database = database;
|
|
14
14
|
this.workspace = workspace;
|
|
15
15
|
this.appConfig = appConfig;
|
|
16
|
-
this.
|
|
16
|
+
this.storageName = storageName;
|
|
17
|
+
this.browserLocalStorage = browserLocalStorage;
|
|
17
18
|
this._onDidChangeStorage = new ide_core_common_1.Emitter();
|
|
18
19
|
this.onDidChangeStorage = this._onDidChangeStorage.event;
|
|
19
20
|
this.state = StorageState.None;
|
|
@@ -21,7 +22,9 @@ class Storage {
|
|
|
21
22
|
this.pendingDeletes = new Set();
|
|
22
23
|
this.pendingInserts = new Map();
|
|
23
24
|
this.toDisposableCollection = new ide_core_common_1.DisposableCollection();
|
|
24
|
-
this.
|
|
25
|
+
this.logger = (0, ide_core_common_1.getDebugLogger)();
|
|
26
|
+
this.readyDeferred = new ide_core_common_1.Deferred();
|
|
27
|
+
this.whenReadyToWriteDeferred = new ide_core_common_1.Deferred();
|
|
25
28
|
this.toDisposableCollection.push(this._onDidChangeStorage);
|
|
26
29
|
this.toDisposableCollection.push(this.workspace.onWorkspaceChanged(() => {
|
|
27
30
|
this.setup(storageName);
|
|
@@ -30,7 +33,10 @@ class Storage {
|
|
|
30
33
|
this.setup(storageName);
|
|
31
34
|
}
|
|
32
35
|
get whenReady() {
|
|
33
|
-
return this.
|
|
36
|
+
return this.readyDeferred.promise;
|
|
37
|
+
}
|
|
38
|
+
get whenReadyToWrite() {
|
|
39
|
+
return this.whenReadyToWriteDeferred.promise;
|
|
34
40
|
}
|
|
35
41
|
get items() {
|
|
36
42
|
return this.cache;
|
|
@@ -39,26 +45,43 @@ class Storage {
|
|
|
39
45
|
return this.cache.size;
|
|
40
46
|
}
|
|
41
47
|
async init(storageName) {
|
|
42
|
-
await this.workspace.whenReady;
|
|
43
48
|
const workspace = this.workspace.workspace;
|
|
44
|
-
|
|
45
|
-
|
|
49
|
+
let cache;
|
|
50
|
+
if (this.browserLocalStorage) {
|
|
51
|
+
cache = await this.browserLocalStorage.getData(storageName);
|
|
52
|
+
}
|
|
53
|
+
if (!cache) {
|
|
54
|
+
await this.database.init(this.appConfig.storageDirName, workspace && workspace.uri);
|
|
55
|
+
cache = await this.database.getItems(storageName);
|
|
56
|
+
if (this.browserLocalStorage) {
|
|
57
|
+
this.browserLocalStorage.setData(storageName, cache);
|
|
58
|
+
}
|
|
59
|
+
this.whenReadyToWriteDeferred.resolve();
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
// 初始化服务端缓存
|
|
63
|
+
this.database.init(this.appConfig.storageDirName, workspace && workspace.uri).then(() => {
|
|
64
|
+
this.database.getItems(storageName).then(async (data) => {
|
|
65
|
+
// 后续以服务端数据为准更新前端缓存数据，防止后续数据存取异常
|
|
66
|
+
this.cache = this.jsonToMap(data);
|
|
67
|
+
if (this.browserLocalStorage) {
|
|
68
|
+
await this.browserLocalStorage.setData(storageName, JSON.stringify(data));
|
|
69
|
+
}
|
|
70
|
+
this.whenReadyToWriteDeferred.resolve();
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
}
|
|
46
74
|
this.cache = this.jsonToMap(cache);
|
|
47
75
|
this.state = StorageState.Initialized;
|
|
76
|
+
this.readyDeferred.resolve();
|
|
48
77
|
}
|
|
49
78
|
setup(storageName) {
|
|
50
|
-
this.
|
|
79
|
+
this.init(storageName);
|
|
51
80
|
}
|
|
52
81
|
async reConnectInit() {
|
|
82
|
+
this.readyDeferred = new ide_core_common_1.Deferred();
|
|
53
83
|
this.setup(this.storageName);
|
|
54
84
|
}
|
|
55
|
-
jsonToMap(json) {
|
|
56
|
-
const itemsMap = new Map();
|
|
57
|
-
for (const key of Object.keys(json)) {
|
|
58
|
-
itemsMap.set(key, json[key]);
|
|
59
|
-
}
|
|
60
|
-
return itemsMap;
|
|
61
|
-
}
|
|
62
85
|
dispose() {
|
|
63
86
|
this.toDisposableCollection.dispose();
|
|
64
87
|
}
|
|
@@ -149,7 +172,8 @@ class Storage {
|
|
|
149
172
|
}
|
|
150
173
|
await this.database.close(() => this.cache);
|
|
151
174
|
}
|
|
152
|
-
flushPending() {
|
|
175
|
+
async flushPending() {
|
|
176
|
+
await this.whenReadyToWrite;
|
|
153
177
|
if (this.pendingInserts.size === 0 && this.pendingDeletes.size === 0) {
|
|
154
178
|
return Promise.resolve();
|
|
155
179
|
}
|
|
@@ -158,6 +182,15 @@ class Storage {
|
|
|
158
182
|
insert: this.mapToJson(this.pendingInserts),
|
|
159
183
|
delete: Array.from(this.pendingDeletes),
|
|
160
184
|
};
|
|
185
|
+
// 同时在 LocalStroage 中同步缓存变化
|
|
186
|
+
if (this.browserLocalStorage) {
|
|
187
|
+
let cache = this.mapToJson(this.cache);
|
|
188
|
+
for (const del of (updateRequest === null || updateRequest === void 0 ? void 0 : updateRequest.delete) || []) {
|
|
189
|
+
delete cache[del];
|
|
190
|
+
}
|
|
191
|
+
cache = Object.assign(Object.assign({}, cache), updateRequest.insert);
|
|
192
|
+
await this.browserLocalStorage.setData(this.storageName, cache);
|
|
193
|
+
}
|
|
161
194
|
// 重置等待队列用于下次存储
|
|
162
195
|
this.pendingDeletes = new Set();
|
|
163
196
|
this.pendingInserts = new Map();
|
|
@@ -171,7 +204,23 @@ class Storage {
|
|
|
171
204
|
}
|
|
172
205
|
return obj;
|
|
173
206
|
}
|
|
207
|
+
jsonToMap(json) {
|
|
208
|
+
if (typeof json === 'string') {
|
|
209
|
+
try {
|
|
210
|
+
json = JSON.parse(json);
|
|
211
|
+
}
|
|
212
|
+
catch (e) {
|
|
213
|
+
this.logger.debug(e);
|
|
214
|
+
return json;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
const itemsMap = new Map();
|
|
218
|
+
for (const key of Object.keys(json)) {
|
|
219
|
+
itemsMap.set(key, json[key]);
|
|
220
|
+
}
|
|
221
|
+
return itemsMap;
|
|
222
|
+
}
|
|
174
223
|
}
|
|
175
224
|
exports.Storage = Storage;
|
|
176
|
-
Storage.DEFAULT_FLUSH_DELAY =
|
|
225
|
+
Storage.DEFAULT_FLUSH_DELAY = 200;
|
|
177
226
|
//# sourceMappingURL=storage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/browser/storage.ts"],"names":[],"mappings":";;;AACA,+
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/browser/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ export declare abstract class StorageServer implements IStorageServer {
|
|
|
9
9
|
abstract deferredStorageDirPath: Deferred<string | undefined>;
|
|
10
10
|
abstract databaseStorageDirPath: string | undefined;
|
|
11
11
|
_cache: any;
|
|
12
|
-
private cachedStoragePath;
|
|
13
12
|
onDidChangeEmitter: Emitter<StorageChange>;
|
|
14
13
|
readonly onDidChange: Event<StorageChange>;
|
|
15
14
|
abstract init(storageDirName?: string, workspaceNamespace?: string): Promise<string | undefined>;
|
|
@@ -24,6 +23,8 @@ export declare class WorkspaceStorageServer extends StorageServer {
|
|
|
24
23
|
private workspaceNamespace;
|
|
25
24
|
deferredStorageDirPath: Deferred<string | undefined>;
|
|
26
25
|
databaseStorageDirPath: string | undefined;
|
|
26
|
+
private readyDeferred;
|
|
27
|
+
get whenReady(): Promise<void>;
|
|
27
28
|
init(storageDirName?: string, workspaceNamespace?: string): Promise<any>;
|
|
28
29
|
getItems(storageName: string): Promise<any>;
|
|
29
30
|
updateItems(storageName: string, request: IUpdateRequest): Promise<void>;
|
|
@@ -31,6 +32,8 @@ export declare class WorkspaceStorageServer extends StorageServer {
|
|
|
31
32
|
export declare class GlobalStorageServer extends StorageServer {
|
|
32
33
|
deferredStorageDirPath: Deferred<string | undefined>;
|
|
33
34
|
databaseStorageDirPath: string | undefined;
|
|
35
|
+
private readyDeferred;
|
|
36
|
+
get whenReady(): Promise<void>;
|
|
34
37
|
init(storageDirName: string): Promise<any>;
|
|
35
38
|
getItems(storageName: string): Promise<any>;
|
|
36
39
|
updateItems(storageName: string, request: IUpdateRequest): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.d.ts","sourceRoot":"","sources":["../../src/browser/storage.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAO,OAAO,EAAE,KAAK,EAAE,OAAO,EAAwB,MAAM,2BAA2B,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAInH,8BACsB,aAAc,YAAW,cAAc;IAE3D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAElD,OAAO,CAAC,oBAAoB,CAA4C;IAGxE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;IAG7D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,CAAC,sBAAsB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,QAAQ,CAAC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7C,MAAM,EAAE,GAAG,CAAM;
|
|
1
|
+
{"version":3,"file":"storage.service.d.ts","sourceRoot":"","sources":["../../src/browser/storage.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAO,OAAO,EAAE,KAAK,EAAE,OAAO,EAAwB,MAAM,2BAA2B,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAInH,8BACsB,aAAc,YAAW,cAAc;IAE3D,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IAElD,OAAO,CAAC,oBAAoB,CAA4C;IAGxE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;IAG7D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,CAAC,sBAAsB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,QAAQ,CAAC,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7C,MAAM,EAAE,GAAG,CAAM;IAEjB,kBAAkB,yBAAgC;IACzD,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAiC;IAE3E,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAChG,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IACpE,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3E,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;cAIhC,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;IAWvD,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM;IAiBvD,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,KAAA,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CA4B9E;AAED,qBACa,sBAAuB,SAAQ,aAAa;IACvD,OAAO,CAAC,kBAAkB,CAAqB;IACxC,sBAAsB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrD,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,OAAO,CAAC,aAAa,CAAwB;IAE7C,IAAI,SAAS,kBAEZ;IAEY,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;IAKhE,QAAQ,CAAC,WAAW,EAAE,MAAM;IAiC5B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;CA6D/D;AAED,qBACa,mBAAoB,SAAQ,aAAa;IAC7C,sBAAsB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACrD,sBAAsB,EAAE,MAAM,GAAG,SAAS,CAAC;IAElD,OAAO,CAAC,aAAa,CAAwB;IAE7C,IAAI,SAAS,kBAEZ;IAEY,IAAI,CAAC,cAAc,EAAE,MAAM;IAIlC,QAAQ,CAAC,WAAW,EAAE,MAAM;IA2B5B,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc;CA0C/D"}
|
|
@@ -11,7 +11,6 @@ let StorageServer = class StorageServer {
|
|
|
11
11
|
constructor() {
|
|
12
12
|
this.storageExistPromises = new Map();
|
|
13
13
|
this._cache = {};
|
|
14
|
-
this.cachedStoragePath = new Map();
|
|
15
14
|
this.onDidChangeEmitter = new ide_core_common_1.Emitter();
|
|
16
15
|
this.onDidChange = this.onDidChangeEmitter.event;
|
|
17
16
|
}
|
|
@@ -87,6 +86,13 @@ StorageServer = tslib_1.__decorate([
|
|
|
87
86
|
], StorageServer);
|
|
88
87
|
exports.StorageServer = StorageServer;
|
|
89
88
|
let WorkspaceStorageServer = class WorkspaceStorageServer extends StorageServer {
|
|
89
|
+
constructor() {
|
|
90
|
+
super(...arguments);
|
|
91
|
+
this.readyDeferred = new ide_core_common_1.Deferred();
|
|
92
|
+
}
|
|
93
|
+
get whenReady() {
|
|
94
|
+
return this.readyDeferred.promise;
|
|
95
|
+
}
|
|
90
96
|
async init(storageDirName, workspaceNamespace) {
|
|
91
97
|
this.workspaceNamespace = workspaceNamespace;
|
|
92
98
|
return await this.setupDirectories(ide_core_common_1.STORAGE_SCHEMA.SCOPE, storageDirName);
|
|
@@ -118,9 +124,11 @@ let WorkspaceStorageServer = class WorkspaceStorageServer extends StorageServer
|
|
|
118
124
|
if (workspaceNamespace) {
|
|
119
125
|
items = items[workspaceNamespace] || {};
|
|
120
126
|
}
|
|
127
|
+
this.readyDeferred.resolve();
|
|
121
128
|
return items;
|
|
122
129
|
}
|
|
123
130
|
async updateItems(storageName, request) {
|
|
131
|
+
await this.whenReady;
|
|
124
132
|
let raw = {};
|
|
125
133
|
const workspaceNamespace = this.workspaceNamespace;
|
|
126
134
|
if (this._cache[storageName]) {
|
|
@@ -179,6 +187,13 @@ WorkspaceStorageServer = tslib_1.__decorate([
|
|
|
179
187
|
], WorkspaceStorageServer);
|
|
180
188
|
exports.WorkspaceStorageServer = WorkspaceStorageServer;
|
|
181
189
|
let GlobalStorageServer = class GlobalStorageServer extends StorageServer {
|
|
190
|
+
constructor() {
|
|
191
|
+
super(...arguments);
|
|
192
|
+
this.readyDeferred = new ide_core_common_1.Deferred();
|
|
193
|
+
}
|
|
194
|
+
get whenReady() {
|
|
195
|
+
return this.readyDeferred.promise;
|
|
196
|
+
}
|
|
182
197
|
async init(storageDirName) {
|
|
183
198
|
return await this.setupDirectories(ide_core_common_1.STORAGE_SCHEMA.GLOBAL, storageDirName);
|
|
184
199
|
}
|
|
@@ -205,9 +220,11 @@ let GlobalStorageServer = class GlobalStorageServer extends StorageServer {
|
|
|
205
220
|
}
|
|
206
221
|
}
|
|
207
222
|
this._cache[storageName] = items;
|
|
223
|
+
this.readyDeferred.resolve();
|
|
208
224
|
return items;
|
|
209
225
|
}
|
|
210
226
|
async updateItems(storageName, request) {
|
|
227
|
+
await this.whenReady;
|
|
211
228
|
let raw = {};
|
|
212
229
|
if (this._cache[storageName]) {
|
|
213
230
|
raw = this._cache[storageName];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/browser/storage.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAyG;AACzG,iEAAgE;AAEhE,sCAAmH;AAEnH,MAAM,EAAE,IAAI,EAAE,GAAG,sBAAI,CAAC;AAGtB,IAAsB,aAAa,GAAnC,MAAsB,aAAa;IAAnC;QAIU,yBAAoB,GAAkC,IAAI,GAAG,EAAE,CAAC;QAWjE,WAAM,GAAQ,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../src/browser/storage.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-storage",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.19.1",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.
|
|
19
|
+
"@opensumi/ide-core-common": "2.19.1"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|
|
22
|
-
"@opensumi/ide-core-browser": "2.
|
|
22
|
+
"@opensumi/ide-core-browser": "2.19.1",
|
|
23
23
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
24
|
-
"@opensumi/ide-file-service": "2.
|
|
25
|
-
"@opensumi/ide-workspace": "2.
|
|
24
|
+
"@opensumi/ide-file-service": "2.19.1",
|
|
25
|
+
"@opensumi/ide-workspace": "2.19.1"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "a3567ece514eefc91f75af85b25a901e4ed41fa3"
|
|
28
28
|
}
|