@atproto/dev-env 0.3.48 → 0.3.50
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +24 -0
- package/dist/bsky.d.ts.map +1 -1
- package/dist/bsky.js +1 -3
- package/dist/bsky.js.map +1 -1
- package/dist/moderator-client.d.ts +1 -0
- package/dist/moderator-client.d.ts.map +1 -1
- package/dist/moderator-client.js +2 -1
- package/dist/moderator-client.js.map +1 -1
- package/dist/network.d.ts.map +1 -1
- package/dist/network.js +6 -5
- package/dist/network.js.map +1 -1
- package/package.json +8 -7
- package/src/bsky.ts +2 -3
- package/src/moderator-client.ts +3 -1
- package/src/network.ts +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,29 @@
|
|
|
1
1
|
# @atproto/dev-env
|
|
2
2
|
|
|
3
|
+
## 0.3.50
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`e6bd5aecc`](https://github.com/bluesky-social/atproto/commit/e6bd5aecce7954d60e5fb263297e697ab7aab98e), [`98711a147`](https://github.com/bluesky-social/atproto/commit/98711a147a8674337f605c6368f39fc10c2fae93), [`33aa0c722`](https://github.com/bluesky-social/atproto/commit/33aa0c722226a18215af0ae1833c7c552fc7aaa7)]:
|
|
8
|
+
- @atproto/api@0.13.7
|
|
9
|
+
- @atproto/ozone@0.1.45
|
|
10
|
+
- @atproto/xrpc-server@0.6.4
|
|
11
|
+
- @atproto/bsky@0.0.83
|
|
12
|
+
- @atproto/pds@0.4.59
|
|
13
|
+
- @atproto/bsync@0.0.6
|
|
14
|
+
- @atproto/crypto@0.4.1
|
|
15
|
+
- @atproto/sync@0.1.1
|
|
16
|
+
|
|
17
|
+
## 0.3.49
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- Updated dependencies [[`b15dec2f4`](https://github.com/bluesky-social/atproto/commit/b15dec2f4feb25ac91b169c83ccff1adbb5a9442), [`642c7ae96`](https://github.com/bluesky-social/atproto/commit/642c7ae968b0dd2bfb448aa6eba0c1fd9312d909)]:
|
|
22
|
+
- @atproto/sync@0.1.0
|
|
23
|
+
- @atproto/ozone@0.1.44
|
|
24
|
+
- @atproto/bsky@0.0.82
|
|
25
|
+
- @atproto/pds@0.4.58
|
|
26
|
+
|
|
3
27
|
## 0.3.48
|
|
4
28
|
|
|
5
29
|
### Patch Changes
|
package/dist/bsky.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bsky.d.ts","sourceRoot":"","sources":["../src/bsky.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"bsky.d.ts","sourceRoot":"","sources":["../src/bsky.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGpC,cAAc,eAAe,CAAA;AAE7B,qBAAa,QAAQ;IAEV,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,IAAI,CAAC,QAAQ;IACjB,MAAM,EAAE,IAAI,CAAC,WAAW;IACxB,SAAS,EAAE,IAAI,CAAC,eAAe;IAC/B,KAAK,EAAE,IAAI,CAAC,SAAS;IACrB,GAAG,EAAE,IAAI,CAAC,gBAAgB;gBAN1B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,IAAI,CAAC,QAAQ,EACjB,MAAM,EAAE,IAAI,CAAC,WAAW,EACxB,SAAS,EAAE,IAAI,CAAC,eAAe,EAC/B,KAAK,EAAE,IAAI,CAAC,SAAS,EACrB,GAAG,EAAE,IAAI,CAAC,gBAAgB;WAGtB,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgFvD,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAEzB;IAED,SAAS,IAAI,QAAQ;IAMrB,SAAS,IAAI,MAAM;IAQnB,gBAAgB;;;IAMV,KAAK;CAOZ"}
|
package/dist/bsky.js
CHANGED
|
@@ -35,7 +35,6 @@ const ui8 = __importStar(require("uint8arrays"));
|
|
|
35
35
|
const bsky = __importStar(require("@atproto/bsky"));
|
|
36
36
|
const api_1 = require("@atproto/api");
|
|
37
37
|
const crypto_1 = require("@atproto/crypto");
|
|
38
|
-
const bsky_1 = require("@atproto/bsky");
|
|
39
38
|
const lib_1 = require("@did-plc/lib");
|
|
40
39
|
const const_1 = require("./const");
|
|
41
40
|
__exportStar(require("@atproto/bsky"), exports);
|
|
@@ -144,10 +143,9 @@ class TestBsky {
|
|
|
144
143
|
service: cfg.repoProvider,
|
|
145
144
|
db,
|
|
146
145
|
idResolver: dataplane.idResolver,
|
|
147
|
-
background: new bsky_1.BackgroundQueue(db),
|
|
148
146
|
});
|
|
149
147
|
await server.start();
|
|
150
|
-
sub.
|
|
148
|
+
sub.start();
|
|
151
149
|
return new TestBsky(url, port, db, server, dataplane, bsync, sub);
|
|
152
150
|
}
|
|
153
151
|
get ctx() {
|
package/dist/bsky.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bsky.js","sourceRoot":"","sources":["../src/bsky.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA8B;AAC9B,iDAAkC;AAClC,oDAAqC;AACrC,sCAAuC;AACvC,4CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"bsky.js","sourceRoot":"","sources":["../src/bsky.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export declare class ModeratorClient {
|
|
|
29
29
|
subject: TakeActionInput['subject'];
|
|
30
30
|
subjectBlobCids?: TakeActionInput['subjectBlobCids'];
|
|
31
31
|
durationInHours?: number;
|
|
32
|
+
acknowledgeAccountSubjects?: boolean;
|
|
32
33
|
reason?: string;
|
|
33
34
|
}, role?: ModLevel): Promise<import("@atproto/api/dist/client/types/tools/ozone/moderation/defs").ModEventView>;
|
|
34
35
|
performReverseTakedown(opts: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moderator-client.d.ts","sourceRoot":"","sources":["../src/moderator-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,6BAA6B,IAAI,mBAAmB,EACpD,iCAAiC,IAAI,uBAAuB,EAC5D,+BAA+B,IAAI,qBAAqB,EACzD,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,KAAK,eAAe,GAAG,mBAAmB,CAAC,WAAW,CAAA;AACtD,KAAK,mBAAmB,GAAG,uBAAuB,CAAC,WAAW,CAAA;AAC9D,KAAK,iBAAiB,GAAG,qBAAqB,CAAC,WAAW,CAAA;AAC1D,KAAK,QAAQ,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAA;AAEhD,qBAAa,eAAe;IAEP,KAAK,EAAE,SAAS;IADnC,KAAK,EAAE,QAAQ,CAAA;gBACI,KAAK,EAAE,SAAS;IAI7B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ;IAapC,aAAa,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,QAAQ;IAazD,WAAW,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,EAAE,QAAQ;IAUrD,SAAS,CACb,IAAI,EAAE;QACJ,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;QAC/B,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAA;QACpD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;KAC/B,EACD,IAAI,CAAC,EAAE,QAAQ;IAsBX,aAAa,CACjB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAA;QACV,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,IAAI,CAAC,EAAE,QAAQ;IAuBX,eAAe,CACnB,IAAI,EAAE;QACJ,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAA;QACpD,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,EACD,IAAI,CAAC,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"moderator-client.d.ts","sourceRoot":"","sources":["../src/moderator-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,6BAA6B,IAAI,mBAAmB,EACpD,iCAAiC,IAAI,uBAAuB,EAC5D,+BAA+B,IAAI,qBAAqB,EACzD,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEnC,KAAK,eAAe,GAAG,mBAAmB,CAAC,WAAW,CAAA;AACtD,KAAK,mBAAmB,GAAG,uBAAuB,CAAC,WAAW,CAAA;AAC9D,KAAK,iBAAiB,GAAG,qBAAqB,CAAC,WAAW,CAAA;AAC1D,KAAK,QAAQ,GAAG,OAAO,GAAG,WAAW,GAAG,QAAQ,CAAA;AAEhD,qBAAa,eAAe;IAEP,KAAK,EAAE,SAAS;IADnC,KAAK,EAAE,QAAQ,CAAA;gBACI,KAAK,EAAE,SAAS;IAI7B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ;IAapC,aAAa,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,QAAQ;IAazD,WAAW,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,EAAE,QAAQ;IAUrD,SAAS,CACb,IAAI,EAAE;QACJ,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;QAC/B,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAA;QACpD,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAA;KAC/B,EACD,IAAI,CAAC,EAAE,QAAQ;IAsBX,aAAa,CACjB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAA;QACV,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,EACD,IAAI,CAAC,EAAE,QAAQ;IAuBX,eAAe,CACnB,IAAI,EAAE;QACJ,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAA;QACpD,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,0BAA0B,CAAC,EAAE,OAAO,CAAA;QACpC,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,EACD,IAAI,CAAC,EAAE,QAAQ;IAgBX,sBAAsB,CAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;QACnC,eAAe,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAA;QACpD,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,EACD,IAAI,CAAC,EAAE,QAAQ;CAYlB"}
|
package/dist/moderator-client.js
CHANGED
|
@@ -59,10 +59,11 @@ class ModeratorClient {
|
|
|
59
59
|
return result.data;
|
|
60
60
|
}
|
|
61
61
|
async performTakedown(opts, role) {
|
|
62
|
-
const { durationInHours, ...rest } = opts;
|
|
62
|
+
const { durationInHours, acknowledgeAccountSubjects, ...rest } = opts;
|
|
63
63
|
return this.emitEvent({
|
|
64
64
|
event: {
|
|
65
65
|
$type: 'tools.ozone.moderation.defs#modEventTakedown',
|
|
66
|
+
acknowledgeAccountSubjects,
|
|
66
67
|
durationInHours,
|
|
67
68
|
},
|
|
68
69
|
...rest,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moderator-client.js","sourceRoot":"","sources":["../src/moderator-client.ts"],"names":[],"mappings":";;;AAaA,MAAa,eAAe;IAE1B,YAAmB,KAAgB;QAAvB;;;;mBAAO,KAAK;WAAW;QADnC;;;;;WAAe;QAEb,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,EAAU,EAAE,IAAe;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAC7D,EAAE,EAAE,EAAE,EACN;YACE,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAClC,iCAAiC,EACjC,IAAI,CACL;SACF,CACF,CAAA;QACD,OAAO,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA0B,EAAE,IAAe;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,aAAa,CAClE,KAAK,EACL;YACE,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAClC,sCAAsC,EACtC,IAAI,CACL;SACF,CACF,CAAA;QACD,OAAO,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAwB,EAAE,IAAe;QACzD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE;YACxE,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAClC,oCAAoC,EACpC,IAAI,CACL;SACF,CAAC,CAAA;QACF,OAAO,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,SAAS,CACb,IAOC,EACD,IAAe;QAEf,MAAM,EACJ,KAAK,EACL,OAAO,EACP,eAAe,EACf,MAAM,GAAG,GAAG,EACZ,SAAS,GAAG,mBAAmB,GAChC,GAAG,IAAI,CAAA;QACR,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAC9D,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,EACtD;YACE,QAAQ,EAAE,kBAAkB;YAC5B,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAClC,kCAAkC,EAClC,IAAI,CACL;SACF,CACF,CAAA;QACD,OAAO,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAKC,EACD,IAAe;QAEf,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,EAAE,SAAS,GAAG,mBAAmB,EAAE,GAAG,IAAI,CAAA;QACvE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAC9D;YACE,OAAO;YACP,KAAK,EAAE;gBACL,KAAK,EAAE,qDAAqD;gBAC5D,OAAO,EAAE,MAAM;aAChB;YACD,SAAS;SACV,EACD;YACE,QAAQ,EAAE,kBAAkB;YAC5B,OAAO,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAClC,kCAAkC,EAClC,IAAI,CACL;SACF,CACF,CAAA;QACD,OAAO,MAAM,CAAC,IAAI,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,
|
|
1
|
+
{"version":3,"file":"moderator-client.js","sourceRoot":"","sources":["../src/moderator-client.ts"],"names":[],"mappings":"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"}
|
package/dist/network.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAK/C,qBAAa,WAAY,SAAQ,oBAAoB;IAE1C,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,OAAO;IACZ,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,UAAU,CAAC;gBAJX,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,UAAU,CAAC,8BAAkB;WAKzB,MAAM,CACjB,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACrC,OAAO,CAAC,WAAW,CAAC;IAwGjB,uBAAuB,CAAC,OAAO,SAAO;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAGnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAK/C,qBAAa,WAAY,SAAQ,oBAAoB;IAE1C,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,OAAO;IACZ,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,UAAU,CAAC;gBAJX,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,UAAU,CAAC,8BAAkB;WAKzB,MAAM,CACjB,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACrC,OAAO,CAAC,WAAW,CAAC;IAwGjB,uBAAuB,CAAC,OAAO,SAAO;IAkBtC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM;IAM3B,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;;;IAWrD,YAAY,CAAC,EACjB,QAAyB,EACzB,QAAyB,GAC1B,EAAE;QACD,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;KAClB;;;IAWK,KAAK;CAQZ"}
|
package/dist/network.js
CHANGED
|
@@ -149,7 +149,7 @@ class TestNetwork extends network_no_appview_1.TestNetworkNoAppView {
|
|
|
149
149
|
await ozone.addAdminDid(ozoneDid);
|
|
150
150
|
(0, util_1.mockNetworkUtilities)(pds, bsky);
|
|
151
151
|
await pds.processAll();
|
|
152
|
-
await bsky.sub.
|
|
152
|
+
await bsky.sub.processAll();
|
|
153
153
|
await thirdPartyPds.close();
|
|
154
154
|
let introspect = undefined;
|
|
155
155
|
if (params.introspect?.port) {
|
|
@@ -164,9 +164,11 @@ class TestNetwork extends network_no_appview_1.TestNetworkNoAppView {
|
|
|
164
164
|
if (!lastSeq)
|
|
165
165
|
return;
|
|
166
166
|
while (Date.now() - start < timeout) {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
167
|
+
await sub.processAll();
|
|
168
|
+
const runnerCursor = await sub.runner.getCursor();
|
|
169
|
+
// if subscription claims to be done, ensure we are at the most recent cursor from PDS, else wait to process again
|
|
170
|
+
// (the subscription may claim to be finished before the PDS has even emitted it's event)
|
|
171
|
+
if (runnerCursor && runnerCursor >= lastSeq) {
|
|
170
172
|
return;
|
|
171
173
|
}
|
|
172
174
|
await (0, common_web_1.wait)(5);
|
|
@@ -177,7 +179,6 @@ class TestNetwork extends network_no_appview_1.TestNetworkNoAppView {
|
|
|
177
179
|
await this.pds.processAll();
|
|
178
180
|
await this.ozone.processAll();
|
|
179
181
|
await this.processFullSubscription(timeout);
|
|
180
|
-
await this.bsky.sub.background.processAll();
|
|
181
182
|
}
|
|
182
183
|
async serviceHeaders(did, lxm, aud) {
|
|
183
184
|
const keypair = await this.pds.ctx.actorStore.keypair(did);
|
package/dist/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA2B;AAC3B,yDAA0C;AAC1C,wDAA8B;AAC9B,oDAA0C;AAC1C,sDAAuD;AAEvD,+BAA+B;AAC/B,+BAA+B;AAC/B,iCAAiC;AACjC,mCAAmC;AACnC,mEAA6D;AAC7D,iCAA6C;AAC7C,6DAA2D;AAC3D,mCAAyC;AACzC,6CAA+C;AAE/C,MAAM,cAAc,GAAG,OAAO,CAAA;AAC9B,MAAM,cAAc,GAAG,YAAY,CAAA;AAEnC,MAAa,WAAY,SAAQ,yCAAoB;IACnD,YACS,GAAY,EACZ,GAAY,EACZ,IAAc,EACd,KAAgB,EAChB,UAA6B;QAEpC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QANf;;;;mBAAO,GAAG;WAAS;QACnB;;;;mBAAO,GAAG;WAAS;QACnB;;;;mBAAO,IAAI;WAAU;QACrB;;;;mBAAO,KAAK;WAAW;QACvB;;;;mBAAO,UAAU;WAAmB;IAGtC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,SAAoC,EAAE;QAEtC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;QACxC,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAA;QACzE,IAAA,gBAAM,EAAC,aAAa,EAAE,gCAAgC,CAAC,CAAA;QACvD,IAAA,gBAAM,EAAC,SAAS,EAAE,8BAA8B,CAAC,CAAA;QACjD,MAAM,gBAAgB,GACpB,MAAM,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;QAE3D,MAAM,GAAG,GAAG,MAAM,aAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;QAElD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,IAAA,kBAAO,GAAE,CAAC,CAAA;QACvD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,IAAA,kBAAO,GAAE,CAAC,CAAA;QACrD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,MAAM,IAAA,kBAAO,GAAE,CAAC,CAAA;QAEzD,MAAM,kBAAkB,GAAG;YACzB,SAAS,EAAE,GAAG,CAAC,GAAG;YAClB,GAAG,MAAM,CAAC,GAAG;YACb,cAAc,EAAE,KAAK;YACrB,IAAI,EAAE,MAAM,IAAA,kBAAO,GAAE;SACtB,CAAA;QACD,MAAM,aAAa,GAAG,MAAM,aAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC9D,MAAM,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,aAAa,CAAC,CAAA;QAClE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GACpC,MAAM,mBAAmB,CAAC,eAAe,EAAE,CAAA;QAE7C,MAAM,IAAI,GAAG,MAAM,eAAQ,CAAC,MAAM,CAAC;YACjC,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,GAAG,CAAC,GAAG;YACf,OAAO;YACP,YAAY,EAAE,kBAAkB,OAAO,EAAE;YACzC,gBAAgB,EAAE,WAAW,gBAAgB,EAAE;YAC/C,aAAa;YACb,SAAS;YACT,aAAa,EAAE,QAAQ;YACvB,oBAAoB,EAAE,CAAC,QAAQ,EAAE,uBAAe,CAAC;YACjD,GAAG,MAAM,CAAC,IAAI;SACf,CAAC,CAAA;QAEF,MAAM,aAAa,GAAG,oBAAoB,SAAS,EAAE,CAAA;QACrD,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,GAAG,CAAC,GAAG;YAClB,cAAc,EAAE,IAAI,CAAC,GAAG;YACxB,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS;YACtC,aAAa;YACb,aAAa,EAAE,QAAQ;YACvB,GAAG,MAAM,CAAC,GAAG;SACd,CAAA;QAED,MAAM,GAAG,GAAG,MAAM,aAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QAE1C,MAAM,KAAK,GAAG,MAAM,iBAAS,CAAC,MAAM,CAAC;YACnC,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,GAAG,CAAC,GAAG;YACf,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,QAAQ;YACnB,gBAAgB,EAAE,SAAS,gBAAgB,IAAI,IAAI,EAAE;YACrD,aAAa;YACb,UAAU,EAAE,IAAI,CAAC,GAAG;YACpB,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS;YAClC,iBAAiB,EAAE,IAAI;YACvB,MAAM,EAAE,GAAG,CAAC,GAAG;YACf,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG;YAC/B,GAAG,MAAM,CAAC,KAAK;SAChB,CAAC,CAAA;QAEF,IAAI,UAA8B,CAAA;QAClC,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG;iBAC/B,SAAS,EAAE;iBACX,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CACtC,EAAE,QAAQ,EAAE,CAAC,EAAE,EACf;gBACE,QAAQ,EAAE,kBAAkB;gBAC5B,OAAO,EAAE,GAAG,CAAC,gBAAgB,EAAE;aAChC,CACF,CAAA;YACH,UAAU,GAAG,MAAM,CAAC,IAAI,CAAA;QAC1B,CAAC;QACD,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE;YACjE,UAAU;SACX,CAAC,CAAA;QAEF,MAAM,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAEjC,IAAA,2BAAoB,EAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC/B,MAAM,GAAG,CAAC,UAAU,EAAE,CAAA;QACtB,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;QAC3B,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;QAE3B,IAAI,UAAU,GAAiC,SAAS,CAAA;QACxD,IAAI,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;YAC5B,UAAU,GAAG,MAAM,6BAAgB,CAAC,KAAK,CACvC,MAAM,CAAC,UAAU,CAAC,IAAI,EACtB,GAAG,EACH,GAAG,EACH,IAAI,EACJ,KAAK,CACN,CAAA;QACH,CAAC;QAED,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,OAAO,GAAG,IAAI;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QACnD,IAAI,CAAC,OAAO;YAAE,OAAM;QACpB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,OAAO,EAAE,CAAC;YACpC,MAAM,GAAG,CAAC,UAAU,EAAE,CAAA;YACtB,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,CAAA;YACjD,kHAAkH;YAClH,yFAAyF;YACzF,IAAI,YAAY,IAAI,YAAY,IAAI,OAAO,EAAE,CAAC;gBAC5C,OAAM;YACR,CAAC;YACD,MAAM,IAAA,iBAAI,EAAC,CAAC,CAAC,CAAA;QACf,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,OAAO,IAAI,CAAC,CAAA;IACnE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAgB;QAC/B,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;QAC3B,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAA;QAC7B,MAAM,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,GAAW,EAAE,GAAY;QACzD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAA,8BAAgB,EAAC;YACjC,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS;YACvC,GAAG;YACH,OAAO;SACR,CAAC,CAAA;QACF,OAAO,EAAE,aAAa,EAAE,UAAU,GAAG,EAAE,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EACjB,QAAQ,GAAG,cAAc,EACzB,QAAQ,GAAG,cAAc,GAI1B;QACC,OAAO;YACL,aAAa,EACX,QAAQ;gBACR,WAAW,CAAC,QAAQ,CAClB,WAAW,CAAC,UAAU,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,EAAE,MAAM,CAAC,EACzD,WAAW,CACZ;SACJ,CAAA;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACxD,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAA;QACxB,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAA;QACvB,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;QACtB,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;QACtB,MAAM,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,CAAA;IAChC,CAAC;CACF;AAjLD,kCAiLC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atproto/dev-env",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.50",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Local development environment helper for atproto development",
|
|
6
6
|
"keywords": [
|
|
@@ -24,17 +24,18 @@
|
|
|
24
24
|
"get-port": "^5.1.1",
|
|
25
25
|
"multiformats": "^9.9.0",
|
|
26
26
|
"uint8arrays": "3.0.0",
|
|
27
|
-
"@atproto/api": "^0.13.
|
|
28
|
-
"@atproto/bsky": "^0.0.
|
|
29
|
-
"@atproto/bsync": "^0.0.
|
|
27
|
+
"@atproto/api": "^0.13.7",
|
|
28
|
+
"@atproto/bsky": "^0.0.83",
|
|
29
|
+
"@atproto/bsync": "^0.0.6",
|
|
30
30
|
"@atproto/common-web": "^0.3.0",
|
|
31
31
|
"@atproto/crypto": "^0.4.1",
|
|
32
32
|
"@atproto/identity": "^0.4.1",
|
|
33
33
|
"@atproto/lexicon": "^0.4.1",
|
|
34
|
-
"@atproto/ozone": "^0.1.
|
|
35
|
-
"@atproto/pds": "^0.4.
|
|
34
|
+
"@atproto/ozone": "^0.1.45",
|
|
35
|
+
"@atproto/pds": "^0.4.59",
|
|
36
|
+
"@atproto/sync": "^0.1.1",
|
|
36
37
|
"@atproto/syntax": "^0.3.0",
|
|
37
|
-
"@atproto/xrpc-server": "^0.6.
|
|
38
|
+
"@atproto/xrpc-server": "^0.6.4"
|
|
38
39
|
},
|
|
39
40
|
"devDependencies": {
|
|
40
41
|
"@types/express": "^4.17.13"
|
package/src/bsky.ts
CHANGED
|
@@ -3,7 +3,6 @@ import * as ui8 from 'uint8arrays'
|
|
|
3
3
|
import * as bsky from '@atproto/bsky'
|
|
4
4
|
import { AtpAgent } from '@atproto/api'
|
|
5
5
|
import { Secp256k1Keypair } from '@atproto/crypto'
|
|
6
|
-
import { BackgroundQueue } from '@atproto/bsky'
|
|
7
6
|
import { Client as PlcClient } from '@did-plc/lib'
|
|
8
7
|
import { BskyConfig } from './types'
|
|
9
8
|
import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const'
|
|
@@ -92,11 +91,11 @@ export class TestBsky {
|
|
|
92
91
|
service: cfg.repoProvider,
|
|
93
92
|
db,
|
|
94
93
|
idResolver: dataplane.idResolver,
|
|
95
|
-
background: new BackgroundQueue(db),
|
|
96
94
|
})
|
|
97
95
|
|
|
98
96
|
await server.start()
|
|
99
|
-
|
|
97
|
+
|
|
98
|
+
sub.start()
|
|
100
99
|
|
|
101
100
|
return new TestBsky(url, port, db, server, dataplane, bsync, sub)
|
|
102
101
|
}
|
package/src/moderator-client.ts
CHANGED
|
@@ -119,15 +119,17 @@ export class ModeratorClient {
|
|
|
119
119
|
subject: TakeActionInput['subject']
|
|
120
120
|
subjectBlobCids?: TakeActionInput['subjectBlobCids']
|
|
121
121
|
durationInHours?: number
|
|
122
|
+
acknowledgeAccountSubjects?: boolean
|
|
122
123
|
reason?: string
|
|
123
124
|
},
|
|
124
125
|
role?: ModLevel,
|
|
125
126
|
) {
|
|
126
|
-
const { durationInHours, ...rest } = opts
|
|
127
|
+
const { durationInHours, acknowledgeAccountSubjects, ...rest } = opts
|
|
127
128
|
return this.emitEvent(
|
|
128
129
|
{
|
|
129
130
|
event: {
|
|
130
131
|
$type: 'tools.ozone.moderation.defs#modEventTakedown',
|
|
132
|
+
acknowledgeAccountSubjects,
|
|
131
133
|
durationInHours,
|
|
132
134
|
},
|
|
133
135
|
...rest,
|
package/src/network.ts
CHANGED
|
@@ -117,7 +117,7 @@ export class TestNetwork extends TestNetworkNoAppView {
|
|
|
117
117
|
|
|
118
118
|
mockNetworkUtilities(pds, bsky)
|
|
119
119
|
await pds.processAll()
|
|
120
|
-
await bsky.sub.
|
|
120
|
+
await bsky.sub.processAll()
|
|
121
121
|
await thirdPartyPds.close()
|
|
122
122
|
|
|
123
123
|
let introspect: IntrospectServer | undefined = undefined
|
|
@@ -140,9 +140,11 @@ export class TestNetwork extends TestNetworkNoAppView {
|
|
|
140
140
|
const lastSeq = await this.pds.ctx.sequencer.curr()
|
|
141
141
|
if (!lastSeq) return
|
|
142
142
|
while (Date.now() - start < timeout) {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
143
|
+
await sub.processAll()
|
|
144
|
+
const runnerCursor = await sub.runner.getCursor()
|
|
145
|
+
// if subscription claims to be done, ensure we are at the most recent cursor from PDS, else wait to process again
|
|
146
|
+
// (the subscription may claim to be finished before the PDS has even emitted it's event)
|
|
147
|
+
if (runnerCursor && runnerCursor >= lastSeq) {
|
|
146
148
|
return
|
|
147
149
|
}
|
|
148
150
|
await wait(5)
|
|
@@ -154,7 +156,6 @@ export class TestNetwork extends TestNetworkNoAppView {
|
|
|
154
156
|
await this.pds.processAll()
|
|
155
157
|
await this.ozone.processAll()
|
|
156
158
|
await this.processFullSubscription(timeout)
|
|
157
|
-
await this.bsky.sub.background.processAll()
|
|
158
159
|
}
|
|
159
160
|
|
|
160
161
|
async serviceHeaders(did: string, lxm: string, aud?: string) {
|