@stacks/storage 2.0.1-beta.1 → 3.0.0
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/CHANGELOG.md +19 -0
- package/README.md +47 -19
- package/dist/esm/storage.d.ts +8 -0
- package/dist/esm/storage.js +9 -2
- package/dist/esm/storage.js.map +1 -1
- package/dist/storage.d.ts +8 -0
- package/dist/storage.js +11 -3
- package/dist/storage.js.map +1 -1
- package/package.json +5 -5
- package/src/storage.ts +21 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [2.0.1](https://github.com/blockstack/blockstack.js/compare/v2.0.1-beta.2...v2.0.1) (2021-08-09)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @stacks/storage
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [2.0.1-beta.2](https://github.com/blockstack/blockstack.js/compare/v2.0.1-beta.1...v2.0.1-beta.2) (2021-08-06)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* fix coreNode error when fetching public data with no user session ([144754b](https://github.com/blockstack/blockstack.js/commit/144754b80f05bff1a4656be87d4ab09b4076d37c))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
## [2.0.1-beta.1](https://github.com/blockstack/blockstack.js/compare/v2.0.0-beta.1...v2.0.1-beta.1) (2021-07-26)
|
|
7
26
|
|
|
8
27
|
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @stacks/storage
|
|
2
2
|
|
|
3
|
-
Store and fetch files with Gaia, the decentralized storage system.
|
|
3
|
+
Store and fetch files with [Gaia](https://docs.stacks.co/build-apps/references/gaia), the decentralized storage system.
|
|
4
4
|
|
|
5
5
|
## Installation
|
|
6
6
|
|
|
@@ -10,14 +10,25 @@ npm install @stacks/storage
|
|
|
10
10
|
|
|
11
11
|
## Usage
|
|
12
12
|
|
|
13
|
+
### Initiate a session
|
|
14
|
+
Users must authenticate to an app before the storage package will work to save or retrieve data on their behalf.
|
|
15
|
+
|
|
16
|
+
See also [authentication guide](https://docs.stacks.co/build-apps/guides/authentication) using [connect](https://github.com/blockstack/connect#readme) for web apps
|
|
17
|
+
|
|
18
|
+
The storage capabilities will work in cases `userSession.isUserSignedIn()` returns `true`
|
|
19
|
+
|
|
13
20
|
### Initiating a storage client
|
|
14
21
|
|
|
15
22
|
```typescript
|
|
16
|
-
import { UserSession } from '@stacks/auth';
|
|
23
|
+
import { UserSession, AppConfig } from '@stacks/auth';
|
|
17
24
|
import { Storage } from '@stacks/storage';
|
|
18
25
|
|
|
26
|
+
const privateKey = '896adae13a1bf88db0b2ec94339b62382ec6f34cd7e2ff8abae7ec271e05f9d8';
|
|
19
27
|
const appConfig = new AppConfig();
|
|
20
28
|
const userSession = new UserSession({ appConfig });
|
|
29
|
+
userSession.store.getSessionData().userData = <any> {
|
|
30
|
+
appPrivateKey: privateKey,
|
|
31
|
+
};
|
|
21
32
|
const storage = new Storage({ userSession });
|
|
22
33
|
```
|
|
23
34
|
|
|
@@ -31,13 +42,15 @@ const myData = JSON.stringify({
|
|
|
31
42
|
num: 1
|
|
32
43
|
});
|
|
33
44
|
|
|
34
|
-
storage.putFile('my_data.json', myData)
|
|
45
|
+
const fileUrl = await storage.putFile('my_data.json', myData);
|
|
46
|
+
// You'll need to save an entirely new string of modified data using putFile with the same fileName every time you want to update a record.
|
|
47
|
+
// There is no separate update method.
|
|
35
48
|
```
|
|
36
49
|
|
|
37
50
|
Store data at a different path
|
|
38
51
|
|
|
39
52
|
```typescript
|
|
40
|
-
storage.putFile('path/my_data.json', myData)
|
|
53
|
+
const fileUrl = await storage.putFile('path/my_data.json', myData);
|
|
41
54
|
```
|
|
42
55
|
|
|
43
56
|
Put file with options
|
|
@@ -53,15 +66,14 @@ const putFileOptions = {
|
|
|
53
66
|
dangerouslyIgnoreEtag: true
|
|
54
67
|
}
|
|
55
68
|
|
|
56
|
-
storage.putFile('my_data.json', myData, putFileOptions)
|
|
69
|
+
const fileUrl = await storage.putFile('my_data.json', myData, putFileOptions);
|
|
57
70
|
```
|
|
58
71
|
|
|
59
72
|
### Get file
|
|
60
73
|
|
|
61
74
|
```typescript
|
|
62
|
-
storage.getFile('my_data.json')
|
|
63
|
-
|
|
64
|
-
});
|
|
75
|
+
const fileContent = await storage.getFile('my_data.json');
|
|
76
|
+
console.log(fileContent);
|
|
65
77
|
```
|
|
66
78
|
|
|
67
79
|
Get file with options
|
|
@@ -73,21 +85,36 @@ const getFileOptions = {
|
|
|
73
85
|
verify: false
|
|
74
86
|
}
|
|
75
87
|
|
|
76
|
-
storage.getFile('my_data.json', getFileOptions)
|
|
77
|
-
|
|
78
|
-
|
|
88
|
+
const fileContent = await storage.getFile('my_data.json', getFileOptions);
|
|
89
|
+
console.log(fileContent);
|
|
90
|
+
```
|
|
91
|
+
|
|
92
|
+
Get file for other user
|
|
93
|
+
|
|
94
|
+
```typescript
|
|
95
|
+
// Retrieve public data saved by users other than the one with the active session
|
|
96
|
+
// User should have registered username via BNS
|
|
97
|
+
const options = {
|
|
98
|
+
username: 'yukan.id',
|
|
99
|
+
// app: 'https://example.org',
|
|
100
|
+
decrypt: false,
|
|
101
|
+
};
|
|
102
|
+
// Set an additional app property within options to retrieve data for a user as saved by an app hosted at a separate domain
|
|
103
|
+
|
|
104
|
+
const fileContent = await storage.getFile('my_data.json', options);
|
|
105
|
+
console.log(fileContent);
|
|
79
106
|
```
|
|
80
107
|
|
|
81
108
|
### Delete file
|
|
82
109
|
|
|
83
110
|
```typescript
|
|
84
|
-
storage.deleteFile('my_data.json');
|
|
111
|
+
await storage.deleteFile('my_data.json');
|
|
85
112
|
```
|
|
86
113
|
|
|
87
114
|
Delete the file and the corresponding signature file if signed
|
|
88
115
|
|
|
89
116
|
```typescript
|
|
90
|
-
storage.deleteFile('my_data.json', { wasSigned: true });
|
|
117
|
+
await storage.deleteFile('my_data.json', { wasSigned: true });
|
|
91
118
|
```
|
|
92
119
|
|
|
93
120
|
### List file
|
|
@@ -95,16 +122,17 @@ storage.deleteFile('my_data.json', { wasSigned: true });
|
|
|
95
122
|
List all files in the user's Gaia hub
|
|
96
123
|
|
|
97
124
|
```typescript
|
|
98
|
-
|
|
125
|
+
const files: Promise<string | undefined | ArrayBuffer | null>[] = [];
|
|
126
|
+
const options = { decrypt: false };
|
|
127
|
+
await storage.listFiles((filename: string) => {
|
|
99
128
|
if (filename === 'my_data.json') {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
return false;
|
|
104
|
-
})
|
|
129
|
+
files.push(storage.getFile(filename, options));
|
|
130
|
+
// return false to stop iterating through files
|
|
131
|
+
return false;
|
|
105
132
|
} else {
|
|
106
133
|
// return true to continue iterating
|
|
107
134
|
return true;
|
|
108
135
|
}
|
|
109
136
|
});
|
|
137
|
+
const fileContents = await Promise.all(files);
|
|
110
138
|
```
|
package/dist/esm/storage.d.ts
CHANGED
|
@@ -39,3 +39,11 @@ export declare class Storage {
|
|
|
39
39
|
getOrSetLocalGaiaHubConnection(): Promise<GaiaHubConfig>;
|
|
40
40
|
setLocalGaiaHubConnection(): Promise<GaiaHubConfig>;
|
|
41
41
|
}
|
|
42
|
+
declare type FileUrlOptions = {
|
|
43
|
+
path: string;
|
|
44
|
+
username: string;
|
|
45
|
+
appOrigin: string;
|
|
46
|
+
zoneFileLookupURL: string;
|
|
47
|
+
};
|
|
48
|
+
export declare function getUserAppFileUrl(options: FileUrlOptions): Promise<string | undefined>;
|
|
49
|
+
export {};
|
package/dist/esm/storage.js
CHANGED
|
@@ -348,11 +348,11 @@ export class Storage {
|
|
|
348
348
|
async deleteFile(path, options) {
|
|
349
349
|
const gaiaHubConfig = await this.getOrSetLocalGaiaHubConnection();
|
|
350
350
|
const opts = Object.assign({}, options);
|
|
351
|
-
const sessionData = this.userSession.store.getSessionData();
|
|
352
351
|
if (opts.wasSigned) {
|
|
353
352
|
try {
|
|
354
353
|
await deleteFromGaiaHub(path, gaiaHubConfig);
|
|
355
354
|
await deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
355
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
356
356
|
delete sessionData.etags[path];
|
|
357
357
|
this.userSession.store.setSessionData(sessionData);
|
|
358
358
|
}
|
|
@@ -360,6 +360,7 @@ export class Storage {
|
|
|
360
360
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
361
361
|
await deleteFromGaiaHub(path, freshHubConfig);
|
|
362
362
|
await deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
363
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
363
364
|
delete sessionData.etags[path];
|
|
364
365
|
this.userSession.store.setSessionData(sessionData);
|
|
365
366
|
}
|
|
@@ -367,12 +368,14 @@ export class Storage {
|
|
|
367
368
|
else {
|
|
368
369
|
try {
|
|
369
370
|
await deleteFromGaiaHub(path, gaiaHubConfig);
|
|
371
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
370
372
|
delete sessionData.etags[path];
|
|
371
373
|
this.userSession.store.setSessionData(sessionData);
|
|
372
374
|
}
|
|
373
375
|
catch (error) {
|
|
374
376
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
375
377
|
await deleteFromGaiaHub(path, freshHubConfig);
|
|
378
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
376
379
|
delete sessionData.etags[path];
|
|
377
380
|
this.userSession.store.setSessionData(sessionData);
|
|
378
381
|
}
|
|
@@ -465,7 +468,11 @@ export class Storage {
|
|
|
465
468
|
return gaiaConfig;
|
|
466
469
|
}
|
|
467
470
|
}
|
|
471
|
+
export function getUserAppFileUrl(options) {
|
|
472
|
+
return new Storage({}).getUserAppFileUrl(options.path, options.username, options.appOrigin, options.zoneFileLookupURL);
|
|
473
|
+
}
|
|
468
474
|
function normalizeOptions(userSession, options) {
|
|
475
|
+
var _a;
|
|
469
476
|
const opts = Object.assign({}, options);
|
|
470
477
|
if (opts.username) {
|
|
471
478
|
if (!opts.app) {
|
|
@@ -482,7 +489,7 @@ function normalizeOptions(userSession, options) {
|
|
|
482
489
|
throw new InvalidStateError('Missing store UserSession');
|
|
483
490
|
}
|
|
484
491
|
const sessionData = userSession.store.getSessionData();
|
|
485
|
-
const configuredCoreNode = sessionData.userData.coreNode || userSession.appConfig.coreNode;
|
|
492
|
+
const configuredCoreNode = ((_a = sessionData.userData) === null || _a === void 0 ? void 0 : _a.coreNode) || userSession.appConfig.coreNode;
|
|
486
493
|
if (configuredCoreNode) {
|
|
487
494
|
opts.zoneFileLookupURL = `${configuredCoreNode}${NAME_LOOKUP_PATH}`;
|
|
488
495
|
}
|
package/dist/esm/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EAEjB,8BAA8B,EAC9B,YAAY,EACZ,cAAc,EACd,eAAe,GAChB,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,wBAAwB,EAExB,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACT,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,+BAA+B,EAC/B,YAAY,EACZ,YAAY,EAEZ,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAe,MAAM,cAAc,CAAC;AA0B5E,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAmDrC,MAAM,OAAO,OAAO;IAGlB,YAAY,OAAuB;QACjC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAY,CAAC;IAC1C,CAAC;IAWD,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,OAAwB;QAClD,MAAM,QAAQ,GAAmB;YAC/B,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,eAAe,CAAC,UAAU,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAE,CAAC,MAAM;SACtE,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAIjD,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YAC9B,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACjD;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAC/C,IAAI,EACJ,GAAG,CAAC,GAAI,EACR,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,iBAAiB,EACrB,CAAC,CAAC,GAAG,CAAC,OAAO,CACd,CAAC;QACF,IAAI,cAAc,KAAK,IAAI,EAAE;YAC3B,OAAO,cAAc,CAAC;SACvB;aAAM,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;YACrC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YACD,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACnC,MAAM,UAAU,GAAG,EAAE,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;aACpE;iBAAM;gBACL,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;aACxD;SACF;aAAM,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE;YACpC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;aACrE;YACD,IAAI,aAAa,CAAC;YAClB,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACnC,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC;aAC7B;YACD,OAAO,IAAI,CAAC,6BAA6B,CACvC,IAAI,EACJ,cAAc,EACd,GAAG,CAAC,GAAI,EACR,aAAa,EACb,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,iBAAiB,CACtB,CAAC;SACH;aAAM,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACtC,OAAO,cAAc,CAAC;SACvB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;IACH,CAAC;IAaD,KAAK,CAAC,iBAAiB,CACrB,IAAY,EACZ,QAAgB,EAChB,SAAiB,EACjB,iBAA0B;QAE1B,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACrE,IAAI,SAA6B,CAAC;QAClC,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;YAClC,IAAI,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;gBACjD,SAAS,GAAG,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;aAChC;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAOD,KAAK,CAAC,cAAc,CAClB,GAAW,EACX,QAAiB,EACjB,iBAA0B;QAE1B,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;QACtF,IAAI,OAA2B,CAAC;QAChC,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,QAAS,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;SAC/F;aAAM;YACL,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAClE,OAAO,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;SACpD;QACD,MAAM,OAAO,GAAG,OAAQ,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACpE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC;IASD,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,OAA2B;QACxD,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzD,IAAI,OAA2B,CAAC;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,GAAI,EACT,IAAI,CAAC,iBAAiB,CACvB,CAAC;SACH;aAAM;YACL,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAClE,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACpC;aAAM;YACL,OAAO,OAAO,CAAC;SAChB;IACH,CAAC;IAOD,KAAK,CAAC,eAAe,CACnB,IAAY,EACZ,GAAW,EACX,QAA4B,EAC5B,iBAAqC,EACrC,SAAkB;QAElB,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,MAAM,MAAM,8BAA8B,CAAC,QAAQ,EAAE,WAAW,IAAI,UAAU,EAAE,IAAI,CAAC,CAAC;SACvF;QACD,IAAI,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACvD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YACnC,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;SACzC;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,IAAI,EAAE;YACR,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAC5D,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACpD;QACD,IACE,SAAS;YACT,WAAW,KAAK,IAAI;YACpB,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC;YAC9B,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAC1C;YACA,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;SACxB;aAAM;YACL,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;SAC/B;IACH,CAAC;IAQD,KAAK,CAAC,wBAAwB,CAAC,IAAY,EAAE,GAAmB;QAK9D,MAAM,OAAO,GAAG,GAAG,IAAI,GAAG,qBAAqB,EAAE,CAAC;QAClD,IAAI;YACF,MAAM,CAAC,YAAY,EAAE,iBAAiB,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACvE,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,GAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,EAAE,KAAK,CAAC;gBAChF,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,GAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC;gBAClF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,iBAAiB,CAAC;aACnE,CAAC,CAAC;YAEH,IAAI,CAAC,YAAY,EAAE;gBACjB,OAAO,YAAY,CAAC;aACrB;YACD,IAAI,CAAC,WAAW,EAAE;gBAChB,MAAM,IAAI,0BAA0B,CAClC,kDAAkD,GAAG,GAAG,IAAI,EAAE,CAC/D,CAAC;aACH;YACD,IAAI,CAAC,iBAAiB,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;gBAC/D,MAAM,IAAI,0BAA0B,CAClC,uCAAuC;oBACrC,GAAG,IAAI,iBAAiB,IAAI,GAAG,qBAAqB,EAAE,CACzD,CAAC;aACH;YACD,IAAI,SAAS,CAAC;YACd,IAAI,SAAS,CAAC;YACd,IAAI;gBACF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAChD,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;gBAChC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;aACjC;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,WAAW,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACb,yCAAyC;wBACvC,UAAU,IAAI,GAAG,qBAAqB,GAAG;wBACzC,gCAAgC,CACnC,CAAC;iBACH;qBAAM;oBACL,MAAM,GAAG,CAAC;iBACX;aACF;YACD,MAAM,aAAa,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YACpD,IAAI,WAAW,KAAK,aAAa,EAAE;gBACjC,MAAM,IAAI,0BAA0B,CAClC,0BAA0B,aAAa,WAAW;oBAChD,wBAAwB,WAAW,GAAG,CACzC,CAAC;aACH;iBAAM,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE;gBAC3D,MAAM,IAAI,0BAA0B,CAClC,yCAAyC;oBACvC,SAAS,IAAI,gBAAgB,IAAI,GAAG,qBAAqB,EAAE,CAC9D,CAAC;aACH;iBAAM;gBACL,OAAO,YAAY,CAAC;aACrB;SACF;QAAC,OAAO,GAAG,EAAE;YAEZ,IAAI,GAAG,YAAY,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACpE,MAAM,IAAI,0BAA0B,CAClC,uCAAuC;oBACrC,GAAG,IAAI,iBAAiB,IAAI,GAAG,qBAAqB,EAAE,CACzD,CAAC;aACH;iBAAM;gBACL,MAAM,GAAG,CAAC;aACX;SACF;IACH,CAAC;IASD,KAAK,CAAC,6BAA6B,CACjC,IAAY,EACZ,cAAsB,EACtB,GAAW,EACX,UAAmB,EACnB,QAAiB,EACjB,iBAA0B;QAE1B,MAAM,aAAa,GAAG,UAAU,IAAI,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC;QAElF,MAAM,YAAY,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;QAE5D,IAAI,OAAe,CAAC;QACpB,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;SACvE;aAAM;YACL,OAAO,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;SAC5C;QACD,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,0BAA0B,CAClC,kDAAkD,GAAG,GAAG,IAAI,EAAE,CAC/D,CAAC;SACH;QACD,IAAI,SAAS,CAAC;QACd,IAAI;YACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;SACxC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,GAAG,YAAY,WAAW,EAAE;gBAC9B,MAAM,IAAI,KAAK,CACb,sEAAsE;oBACpE,6CAA6C;oBAC7C,qCAAqC,CACxC,CAAC;aACH;iBAAM;gBACL,MAAM,GAAG,CAAC;aACX;SACF;QACD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC;QAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QACxC,MAAM,aAAa,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAE1D,IAAI,CAAC,eAAe,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,EAAE;YACjD,MAAM,IAAI,0BAA0B,CAClC,sDAAsD,GAAG,IAAI,IAAI,EAAE,CACpE,CAAC;SACH;aAAM,IAAI,aAAa,KAAK,OAAO,EAAE;YACpC,MAAM,IAAI,0BAA0B,CAClC,0BAA0B,aAAa,WAAW,GAAG,wBAAwB,OAAO,GAAG,CACxF,CAAC;SACH;aAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE;YAC/D,MAAM,IAAI,0BAA0B,CAClC,gDAAgD,GAAG,IAAI,IAAI,EAAE,CAC9D,CAAC;SACH;aAAM,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YACzC,MAAM,UAAU,GAAG,EAAE,UAAU,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SAChE;aAAM;YACL,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;SACpD;IACH,CAAC;IAWD,KAAK,CAAC,OAAO,CACX,IAAY,EACZ,OAAiD,EACjD,OAAwB;;QAExB,MAAM,QAAQ,GAAmB;YAC/B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,KAAK;YACX,kBAAkB,EAAE,KAAK;YACzB,qBAAqB,EAAE,KAAK;SAC7B,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEjD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAClE,MAAM,cAAc,GAAG,gBAAgB,CAAC,aAAa,CAAC,8BAA+B,CAAC,CAAC;QACvF,MAAM,YAAY,GAAG,cAAc,GAAG,CAAC,CAAC;QAExC,MAAM,aAAa,GAAG,IAAI,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,WAAY,CAAC,CAAC;QACvE,IAAI,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC;QAG5C,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,YAAY,IAAI,aAAa,CAAC,iBAAiB,GAAG,cAAc,EAAE;YACpF,MAAM,UAAU,GAAG,4CAA4C,cAAc,gCAAgC,aAAa,CAAC,iBAAiB,QAAQ,CAAC;YACrJ,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAC3E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM,OAAO,CAAC;SACf;QAID,IAAI,GAAG,CAAC,OAAO,IAAI,YAAY,EAAE;YAC/B,MAAM,aAAa,GAAG,wBAAwB,CAAC;gBAC7C,aAAa,EAAE,aAAa,CAAC,iBAAiB;gBAC9C,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI;gBAChB,kBAAkB,EAAE,GAAG,CAAC,kBAAmB;aAC5C,CAAC,CAAC;YACH,IAAI,aAAa,GAAG,cAAc,EAAE;gBAClC,MAAM,UAAU,GAAG,4CAA4C,cAAc,gCAAgC,aAAa,yBAAyB,CAAC;gBACpJ,MAAM,OAAO,GAAG,IAAI,oBAAoB,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;gBAC3E,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACvB,MAAM,OAAO,CAAC;aACf;SACF;QAED,IAAI,IAAY,CAAC;QACjB,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QAE5D,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE;YAC9B,IAAI,MAAA,WAAW,CAAC,KAAK,0CAAG,IAAI,CAAC,EAAE;gBAC7B,OAAO,GAAG,KAAK,CAAC;gBAChB,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,0CAAG,IAAI,CAAC,CAAC;aAClC;SACF;QAED,IAAI,QAAuD,CAAC;QAG5D,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,UAAkB,CAAC;YACvB,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAChC,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;aACvB;iBAAM;gBACL,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC;aAC5D;YACD,MAAM,eAAe,GAAG,SAAS,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAC3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YAEzD,QAAQ,GAAG,KAAK,EAAE,SAAwB,EAAE,EAAE;gBAC5C,MAAM,aAAa,GAAG,CACpB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,eAAe,CACb,IAAI,EACJ,WAAW,EACX,SAAS,EACT,WAAW,EACX,OAAO,EACP,IAAI,EACJ,GAAG,CAAC,qBAAqB,CAC1B;oBACD,eAAe,CACb,GAAG,IAAI,GAAG,qBAAqB,EAAE,EACjC,gBAAgB,EAChB,SAAS,EACT,kBAAkB,CACnB;iBACF,CAAC,CACH,CAAC,CAAC,CAAC,CAAC;gBACL,IAAI,CAAC,GAAG,CAAC,qBAAqB,IAAI,aAAa,CAAC,IAAI,EAAE;oBACpD,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;iBACpD;gBACD,OAAO,aAAa,CAAC,SAAS,CAAC;YACjC,CAAC,CAAC;SACH;aAAM;YAEL,IAAI,gBAAwC,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBAG7B,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAAC;aAC1C;iBAAM;gBAGL,IAAI,SAAiB,CAAC;gBACtB,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;oBACnC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC;iBACzB;qBAAM,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACvC,SAAS,GAAG,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBAC/C;qBAAM;oBACL,SAAS,GAAG,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC;iBACpF;gBACD,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;gBAC/C,gBAAgB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,EAAE;oBACpE,SAAS;oBACT,SAAS,EAAE,aAAa,CAAC,SAAS;oBAClC,kBAAkB,EAAE,GAAG,CAAC,kBAAkB;oBAC1C,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf,CAAC,CAAC;gBACH,WAAW,GAAG,kBAAkB,CAAC;aAClC;YAED,QAAQ,GAAG,KAAK,EAAE,SAAwB,EAAE,EAAE;gBAC5C,MAAM,aAAa,GAAG,MAAM,eAAe,CACzC,IAAI,EACJ,gBAAgB,EAChB,SAAS,EACT,WAAW,EACX,OAAO,EACP,IAAI,EACJ,GAAG,CAAC,qBAAqB,CAC1B,CAAC;gBACF,IAAI,aAAa,CAAC,IAAI,EAAE;oBACtB,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC;oBAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;iBACpD;gBACD,OAAO,aAAa,CAAC,SAAS,CAAC;YACjC,CAAC,CAAC;SACH;QAED,IAAI;YACF,OAAO,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;SACtC;QAAC,OAAO,KAAU,EAAE;YAGnB,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE;gBACjC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;gBAC5E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC9D,OAAO,MAAM,QAAQ,CAAC,cAAc,CAAC,CAAC;aACvC;iBAAM;gBACL,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAUD,KAAK,CAAC,UAAU,CACd,IAAY,EACZ,OAEC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,SAAS,EAAE;YAElB,IAAI;gBACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAC7C,MAAM,iBAAiB,CAAC,GAAG,IAAI,GAAG,qBAAqB,EAAE,EAAE,aAAa,CAAC,CAAC;gBAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC5D,OAAO,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;aACpD;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC9D,MAAM,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;gBAC9C,MAAM,iBAAiB,CAAC,GAAG,IAAI,GAAG,qBAAqB,EAAE,EAAE,aAAa,CAAC,CAAC;gBAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC5D,OAAO,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;aACpD;SACF;aAAM;YACL,IAAI;gBACF,MAAM,iBAAiB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC5D,OAAO,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;aACpD;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC9D,MAAM,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;gBAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC5D,OAAO,WAAW,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;aACpD;SACF;IACH,CAAC;IASD,eAAe,CAAC,UAAkB,EAAE,aAAqB;QACvD,OAAO,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;IAeD,KAAK,CAAC,aAAa,CACjB,SAA+B,EAC/B,IAAmB,EACnB,SAAiB,EACjB,SAAiB,EACjB,QAAmC;QAEnC,IAAI,SAAS,GAAG,KAAK,EAAE;YAGrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,SAAS,GAAG,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC,CAAC;QACvE,IAAI,QAAkB,CAAC;QACvB,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,MAAM,YAAY,GAAG;gBACnB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;oBAClC,gBAAgB,EAAE,GAAG,WAAW,CAAC,MAAM,EAAE;oBACzC,aAAa,EAAE,UAAU,SAAS,CAAC,KAAK,EAAE;iBAC3C;gBACD,IAAI,EAAE,WAAW;aAClB,CAAC;YACF,QAAQ,GAAG,MAAM,YAAY,CAC3B,GAAG,SAAS,CAAC,MAAM,eAAe,SAAS,CAAC,OAAO,EAAE,EACrD,YAAY,CACb,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChB,MAAM,MAAM,8BAA8B,CAAC,QAAQ,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;aACtF;SACF;QAAC,OAAO,KAAK,EAAE;YAGd,IAAI,SAAS,KAAK,CAAC,EAAE;gBACnB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC9D,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;aAC7E;YACD,MAAM,KAAK,CAAC;SACb;QAED,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;QACrC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC;QACnC,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAG7C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAGvC,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;gBACvB,aAAa,EAAE,CAAC;gBAChB,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,CAAC,EAAE,EAAE;oBAEP,OAAO,SAAS,GAAG,CAAC,CAAC;iBACtB;aACF;SACF;QACD,IAAI,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAElC,OAAO,IAAI,CAAC,aAAa,CACvB,SAAS,EACT,QAAQ,EACR,SAAS,GAAG,CAAC,EACb,SAAS,GAAG,aAAa,EACzB,QAAQ,CACT,CAAC;SACH;aAAM;YAEL,OAAO,SAAS,GAAG,aAAa,CAAC;SAClC;IACH,CAAC;IAYD,SAAS,CAAC,QAAmC;QAC3C,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAKD,KAAK,CAAC,8BAA8B;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;SACjD;QACD,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC;QACzC,IAAI,SAAS,EAAE;YACb,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,yBAAyB,EAAE,CAAC;IAC1C,CAAC;IASD,KAAK,CAAC,yBAAyB;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;QAEjD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;SACjD;QAED,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,CAAC,MAAM,GAAG,+BAA+B,CAAC;SACnD;QAED,MAAM,UAAU,GAAG,MAAM,gBAAgB,CACvC,QAAQ,CAAC,MAAM,EACf,QAAQ,CAAC,aAAa,EACtB,QAAQ,CAAC,oBAAoB,CAC9B,CAAC;QAEF,QAAQ,CAAC,aAAa,GAAG,UAAU,CAAC;QAEpC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;QAC5D,WAAW,CAAC,QAAS,CAAC,aAAa,GAAG,UAAU,CAAC;QACjD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEnD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAQD,MAAM,UAAU,iBAAiB,CAAC,OAAuB;IACvD,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CACtC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;AACJ,CAAC;AAUD,SAAS,gBAAgB,CACvB,WAAwB,EACxB,OAIK;;IAEL,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACxC,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;gBAC1B,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;aAClD;YACD,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC;SAC5C;QACD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;gBAC1B,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;aAClD;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;gBACtB,MAAM,IAAI,iBAAiB,CAAC,2BAA2B,CAAC,CAAC;aAC1D;YACD,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YAEvD,MAAM,kBAAkB,GAAG,CAAA,MAAA,WAAW,CAAC,QAAQ,0CAAE,QAAQ,KAAI,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC;YAC5F,IAAI,kBAAkB,EAAE;gBACtB,IAAI,CAAC,iBAAiB,GAAG,GAAG,kBAAkB,GAAG,gBAAgB,EAAE,CAAC;aACrE;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAMD,SAAS,sBAAsB,CAAC,KAAmB;IACjD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC3D,OAAO,KAAK,CAAC;KACd;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;IAE7C,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,OAAO,IAAI,CAAC;KACb;IAED,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,EAAE;QAC1C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/storage.d.ts
CHANGED
|
@@ -39,3 +39,11 @@ export declare class Storage {
|
|
|
39
39
|
getOrSetLocalGaiaHubConnection(): Promise<GaiaHubConfig>;
|
|
40
40
|
setLocalGaiaHubConnection(): Promise<GaiaHubConfig>;
|
|
41
41
|
}
|
|
42
|
+
declare type FileUrlOptions = {
|
|
43
|
+
path: string;
|
|
44
|
+
username: string;
|
|
45
|
+
appOrigin: string;
|
|
46
|
+
zoneFileLookupURL: string;
|
|
47
|
+
};
|
|
48
|
+
export declare function getUserAppFileUrl(options: FileUrlOptions): Promise<string | undefined>;
|
|
49
|
+
export {};
|
package/dist/storage.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Storage = void 0;
|
|
3
|
+
exports.getUserAppFileUrl = exports.Storage = void 0;
|
|
4
4
|
const hub_1 = require("./hub");
|
|
5
5
|
const encryption_1 = require("@stacks/encryption");
|
|
6
6
|
const common_1 = require("@stacks/common");
|
|
@@ -351,11 +351,11 @@ class Storage {
|
|
|
351
351
|
async deleteFile(path, options) {
|
|
352
352
|
const gaiaHubConfig = await this.getOrSetLocalGaiaHubConnection();
|
|
353
353
|
const opts = Object.assign({}, options);
|
|
354
|
-
const sessionData = this.userSession.store.getSessionData();
|
|
355
354
|
if (opts.wasSigned) {
|
|
356
355
|
try {
|
|
357
356
|
await hub_1.deleteFromGaiaHub(path, gaiaHubConfig);
|
|
358
357
|
await hub_1.deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
358
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
359
359
|
delete sessionData.etags[path];
|
|
360
360
|
this.userSession.store.setSessionData(sessionData);
|
|
361
361
|
}
|
|
@@ -363,6 +363,7 @@ class Storage {
|
|
|
363
363
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
364
364
|
await hub_1.deleteFromGaiaHub(path, freshHubConfig);
|
|
365
365
|
await hub_1.deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
366
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
366
367
|
delete sessionData.etags[path];
|
|
367
368
|
this.userSession.store.setSessionData(sessionData);
|
|
368
369
|
}
|
|
@@ -370,12 +371,14 @@ class Storage {
|
|
|
370
371
|
else {
|
|
371
372
|
try {
|
|
372
373
|
await hub_1.deleteFromGaiaHub(path, gaiaHubConfig);
|
|
374
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
373
375
|
delete sessionData.etags[path];
|
|
374
376
|
this.userSession.store.setSessionData(sessionData);
|
|
375
377
|
}
|
|
376
378
|
catch (error) {
|
|
377
379
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
378
380
|
await hub_1.deleteFromGaiaHub(path, freshHubConfig);
|
|
381
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
379
382
|
delete sessionData.etags[path];
|
|
380
383
|
this.userSession.store.setSessionData(sessionData);
|
|
381
384
|
}
|
|
@@ -469,7 +472,12 @@ class Storage {
|
|
|
469
472
|
}
|
|
470
473
|
}
|
|
471
474
|
exports.Storage = Storage;
|
|
475
|
+
function getUserAppFileUrl(options) {
|
|
476
|
+
return new Storage({}).getUserAppFileUrl(options.path, options.username, options.appOrigin, options.zoneFileLookupURL);
|
|
477
|
+
}
|
|
478
|
+
exports.getUserAppFileUrl = getUserAppFileUrl;
|
|
472
479
|
function normalizeOptions(userSession, options) {
|
|
480
|
+
var _a;
|
|
473
481
|
const opts = Object.assign({}, options);
|
|
474
482
|
if (opts.username) {
|
|
475
483
|
if (!opts.app) {
|
|
@@ -486,7 +494,7 @@ function normalizeOptions(userSession, options) {
|
|
|
486
494
|
throw new common_1.InvalidStateError('Missing store UserSession');
|
|
487
495
|
}
|
|
488
496
|
const sessionData = userSession.store.getSessionData();
|
|
489
|
-
const configuredCoreNode = sessionData.userData.coreNode || userSession.appConfig.coreNode;
|
|
497
|
+
const configuredCoreNode = ((_a = sessionData.userData) === null || _a === void 0 ? void 0 : _a.coreNode) || userSession.appConfig.coreNode;
|
|
490
498
|
if (configuredCoreNode) {
|
|
491
499
|
opts.zoneFileLookupURL = `${configuredCoreNode}${auth_1.NAME_LOOKUP_PATH}`;
|
|
492
500
|
}
|
package/dist/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stacks/storage",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "Stacks storage library",
|
|
5
5
|
"author": "yknl <yukanliao@gmail.com>",
|
|
6
6
|
"homepage": "https://blockstack.org",
|
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
"url": "https://github.com/blockstack/blockstack.js/issues"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@stacks/auth": "^
|
|
34
|
-
"@stacks/common": "^
|
|
35
|
-
"@stacks/encryption": "^
|
|
33
|
+
"@stacks/auth": "^3.0.0",
|
|
34
|
+
"@stacks/common": "^3.0.0",
|
|
35
|
+
"@stacks/encryption": "^3.0.0",
|
|
36
36
|
"bitcoinjs-lib": "^5.2.0",
|
|
37
37
|
"jsontokens": "^3.0.0"
|
|
38
38
|
},
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"typings": "dist/index.d.ts",
|
|
57
57
|
"umd:main": "dist/index.umd.js",
|
|
58
58
|
"unpkg": "dist/index.umd.js",
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "728b58358f2876d282f511ba1fc6c4fa9a1ac2f3"
|
|
60
60
|
}
|
package/src/storage.ts
CHANGED
|
@@ -606,7 +606,7 @@ export class Storage {
|
|
|
606
606
|
|
|
607
607
|
try {
|
|
608
608
|
return await uploadFn(gaiaHubConfig);
|
|
609
|
-
} catch (error) {
|
|
609
|
+
} catch (error: any) {
|
|
610
610
|
// If the upload fails on first attempt, it could be due to a recoverable
|
|
611
611
|
// error which may succeed by refreshing the config and retrying.
|
|
612
612
|
if (isRecoverableGaiaError(error)) {
|
|
@@ -636,29 +636,32 @@ export class Storage {
|
|
|
636
636
|
) {
|
|
637
637
|
const gaiaHubConfig = await this.getOrSetLocalGaiaHubConnection();
|
|
638
638
|
const opts = Object.assign({}, options);
|
|
639
|
-
const sessionData = this.userSession.store.getSessionData();
|
|
640
639
|
if (opts.wasSigned) {
|
|
641
640
|
// If signed, delete both the content file and the .sig file
|
|
642
641
|
try {
|
|
643
642
|
await deleteFromGaiaHub(path, gaiaHubConfig);
|
|
644
643
|
await deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
644
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
645
645
|
delete sessionData.etags![path];
|
|
646
646
|
this.userSession.store.setSessionData(sessionData);
|
|
647
647
|
} catch (error) {
|
|
648
648
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
649
649
|
await deleteFromGaiaHub(path, freshHubConfig);
|
|
650
650
|
await deleteFromGaiaHub(`${path}${SIGNATURE_FILE_SUFFIX}`, gaiaHubConfig);
|
|
651
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
651
652
|
delete sessionData.etags![path];
|
|
652
653
|
this.userSession.store.setSessionData(sessionData);
|
|
653
654
|
}
|
|
654
655
|
} else {
|
|
655
656
|
try {
|
|
656
657
|
await deleteFromGaiaHub(path, gaiaHubConfig);
|
|
658
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
657
659
|
delete sessionData.etags![path];
|
|
658
660
|
this.userSession.store.setSessionData(sessionData);
|
|
659
661
|
} catch (error) {
|
|
660
662
|
const freshHubConfig = await this.setLocalGaiaHubConnection();
|
|
661
663
|
await deleteFromGaiaHub(path, freshHubConfig);
|
|
664
|
+
const sessionData = this.userSession.store.getSessionData();
|
|
662
665
|
delete sessionData.etags![path];
|
|
663
666
|
this.userSession.store.setSessionData(sessionData);
|
|
664
667
|
}
|
|
@@ -833,6 +836,21 @@ export class Storage {
|
|
|
833
836
|
}
|
|
834
837
|
}
|
|
835
838
|
|
|
839
|
+
type FileUrlOptions = {
|
|
840
|
+
path: string;
|
|
841
|
+
username: string;
|
|
842
|
+
appOrigin: string;
|
|
843
|
+
zoneFileLookupURL: string;
|
|
844
|
+
};
|
|
845
|
+
export function getUserAppFileUrl(options: FileUrlOptions): Promise<string | undefined> {
|
|
846
|
+
return new Storage({}).getUserAppFileUrl(
|
|
847
|
+
options.path,
|
|
848
|
+
options.username,
|
|
849
|
+
options.appOrigin,
|
|
850
|
+
options.zoneFileLookupURL
|
|
851
|
+
);
|
|
852
|
+
}
|
|
853
|
+
|
|
836
854
|
/**
|
|
837
855
|
* @param {Object} [options=null] - options object
|
|
838
856
|
* @param {String} options.username - the Blockstack ID to lookup for multi-player storage
|
|
@@ -866,7 +884,7 @@ function normalizeOptions<T>(
|
|
|
866
884
|
}
|
|
867
885
|
const sessionData = userSession.store.getSessionData();
|
|
868
886
|
// Use the user specified coreNode if available, otherwise use the app specified coreNode.
|
|
869
|
-
const configuredCoreNode = sessionData.userData
|
|
887
|
+
const configuredCoreNode = sessionData.userData?.coreNode || userSession.appConfig.coreNode;
|
|
870
888
|
if (configuredCoreNode) {
|
|
871
889
|
opts.zoneFileLookupURL = `${configuredCoreNode}${NAME_LOOKUP_PATH}`;
|
|
872
890
|
}
|