dfx 0.52.0 → 0.52.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.
@@ -9,7 +9,7 @@ import * as Layer from "@effect/io/Layer";
9
9
  import { Tag } from "@effect/data/Context";
10
10
  import * as Hub from "@effect/io/Hub";
11
11
  import * as Queue from "@effect/io/Queue";
12
- export declare const make: Effect.Effect<RateLimiter | Log | DiscordConfig | DiscordWS, never, {
12
+ export declare const make: Effect.Effect<DiscordConfig | Log | RateLimiter | DiscordWS, never, {
13
13
  readonly connect: (shard: [id: number, count: number], hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, never, {
14
14
  readonly id: [id: number, count: number];
15
15
  readonly send: (p: Message) => Effect.Effect<never, never, boolean>;
@@ -19,7 +19,7 @@ export declare const make: Effect.Effect<RateLimiter | Log | DiscordConfig | Dis
19
19
  export interface Shard extends Effect.Effect.Success<typeof make> {
20
20
  }
21
21
  export declare const Shard: Tag<Shard, Shard>;
22
- export declare const LiveShard: Layer.Layer<import("dfx/RateLimit").RateLimitStore | Log | DiscordConfig | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
22
+ export declare const LiveShard: Layer.Layer<DiscordConfig | Log | import("dfx/RateLimit").RateLimitStore | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
23
23
  export interface RunningShard extends Effect.Effect.Success<ReturnType<Shard["connect"]>> {
24
24
  }
25
25
  //# sourceMappingURL=Shard.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAiB,MAAM,8BAA8B,CAAA;AAMvE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAYzC,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC/C,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;;2BAahD,OAAO;;;EAkJ5B,CAAA;AAEF,MAAM,WAAW,KAAM,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACpE,eAAO,MAAM,KAAK,mBAAe,CAAA;AACjC,eAAO,MAAM,SAAS,iJAGrB,CAAA;AAED,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}
1
+ {"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAiB,MAAM,8BAA8B,CAAA;AAMvE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAYzC,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC/C,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;;2BAahD,OAAO;;;EA4I5B,CAAA;AAEF,MAAM,WAAW,KAAM,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACpE,eAAO,MAAM,KAAK,mBAAe,CAAA;AACjC,eAAO,MAAM,SAAS,iJAGrB,CAAA;AAED,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}
@@ -67,14 +67,10 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
67
67
  intents: gateway.intents,
68
68
  presence: gateway.presence
69
69
  }, latestReady, latestSequence);
70
- const onPayload = p => Effect.tap(Effect.all([updateLatestReady(p), updateLatestSequence(p), maybeUpdateUrl(p)], {
71
- discard: true
72
- }), () => {
70
+ const onPayload = p => updateLatestReady(p).pipe(Effect.zipRight(updateLatestSequence(p)), Effect.zipRight(maybeUpdateUrl(p)), Effect.tap(() => {
73
71
  switch (p.op) {
74
72
  case 10 /* Discord.GatewayOpcode.HELLO */:
75
- return Effect.all([Effect.tap(identify, prioritySend), setPhase(1 /* Phase.Handshake */), Queue.offer(hellos, p)], {
76
- discard: true
77
- });
73
+ return Effect.tap(identify, prioritySend).pipe(Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(Queue.offer(hellos, p)));
78
74
  case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
79
75
  return Queue.offer(acks, p);
80
76
  case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
@@ -86,7 +82,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
86
82
  return Hub.publish(hub, p);
87
83
  }
88
84
  return Effect.unit;
89
- });
85
+ }));
90
86
  const drainSendQueue = Queue.take(sendQueue).pipe(Effect.tap(send), Effect.forever);
91
87
  const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
92
88
  discard: true,
@@ -1 +1 @@
1
- {"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_RateLimit","_DiscordWS","Heartbeats","_interopRequireWildcard","Identify","InvalidSession","Utils","_WS","_Log","Effect","Layer","_Context","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","gen","_","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","log","Log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","debug","outbound","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","Reconnect","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","all","discard","fromPayload","publish","drainSendQueue","forever","run","concurrency","id","exports","Shard","Tag","LiveShard","provide","merge","LiveDiscordWS","LiveRateLimiter","effect"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,cAAA,gBAAAC,OAAA;AACA,IAAAC,UAAA,gBAAAD,OAAA;AAEA,IAAAE,UAAA,gBAAAF,OAAA;AACA,IAAAG,UAAA,gBAAAC,uBAAA,eAAAJ,OAAA;AACA,IAAAK,QAAA,gBAAAD,uBAAA,eAAAJ,OAAA;AACA,IAAAM,cAAA,gBAAAF,uBAAA,eAAAJ,OAAA;AACA,IAAAO,KAAA,gBAAAH,uBAAA,eAAAJ,OAAA;AACA,IAAAQ,GAAA,gBAAAR,OAAA;AACA,IAAAS,IAAA,gBAAAT,OAAA;AAEA,IAAAU,MAAA,gBAAAN,uBAAA,eAAAJ,OAAA;AACA,IAAAW,KAAA,gBAAAP,uBAAA,eAAAJ,OAAA;AACA,IAAAY,QAAA,gBAAAZ,OAAA;AACA,IAAAa,MAAA,gBAAAT,uBAAA,eAAAJ,OAAA;AACA,IAAAc,GAAA,gBAAAV,uBAAA,eAAAJ,OAAA;AACA,IAAAe,KAAA,gBAAAX,uBAAA,eAAAJ,OAAA;AACA,IAAAgB,GAAA,gBAAAZ,uBAAA,eAAAJ,OAAA;AACA,IAAAiB,QAAA,gBAAAb,uBAAA,eAAAJ,OAAA;AACA,IAAAkB,KAAA,gBAAAd,uBAAA,eAAAJ,OAAA;AACA,IAAAmB,YAAA,gBAAAf,uBAAA,eAAAJ,OAAA;AAAwD,SAAAoB,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAjB,wBAAAqB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAQjD,MAAMW,IAAI,gBAAGhC,MAAM,CAACiC,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAM;IAAEC,OAAO;IAAEC;EAAK,CAAE,GAAG,OAAOF,CAAC,CAACG,4BAAa,CAAC;EAClD,MAAMC,OAAO,GAAG,OAAOJ,CAAC,CAACK,sBAAW,CAAC;EACrC,MAAMC,GAAG,GAAG,OAAON,CAAC,CAACO,oBAAS,CAAC;EAC/B,MAAMC,GAAG,GAAG,OAAOR,CAAC,CAACS,QAAG,CAAC;EAEzB,MAAMC,OAAO,GAAGA,CACdC,KAAkC,EAClCC,GAA0D,EAC1DC,SAAmE,KAEnE/C,MAAM,CAACiC,GAAG,CAAC,WAAWC,CAAC;IACrB,MAAMc,aAAa,GAAG,OAAOd,CAAC,CAAC7B,KAAK,CAAC4C,SAAS,EAAW,CAAC;IAC1D,MAAMC,YAAY,GAAG,OAAOhB,CAAC,CAAC7B,KAAK,CAAC4C,SAAS,EAAW,CAAC;IACzD,MAAME,KAAK,GAAG,OAAOjB,CAAC,CAAC5B,GAAG,CAAC0B,IAAI,0BAAkB,CAAC;IAClD,MAAMoB,QAAQ,GAAIC,CAAQ,IACxBrD,MAAM,CAACsD,OAAO,CAAChD,GAAG,CAACyB,GAAG,CAACoB,KAAK,EAAEE,CAAC,CAAC,EAAEX,GAAG,CAACa,KAAK,CAAC,OAAO,EAAEV,KAAK,EAAE,OAAO,EAAEQ,CAAC,CAAC,CAAC;IAC1E,MAAMG,QAAQ,GAAGxD,MAAM,CAACsD,OAAO,CAC7BjD,KAAK,CAACoD,IAAI,CAACT,aAAa,CAAC,EACzBV,OAAO,CAACoB,SAAS,CAAC,gBAAgB,EAAEnD,QAAQ,CAACoD,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAC9D;IAED,MAAMC,IAAI,GAAIP,CAAU,IACtBrD,MAAM,CAAC6D,OAAO,CAACvD,GAAG,CAACc,GAAG,CAAC+B,KAAK,CAAC,EAAEA,KAAK,IAClCA,KAAK,+BACD9C,KAAK,CAACyD,KAAK,CAACd,aAAa,EAAEK,CAAC,CAAC,GAC7BhD,KAAK,CAACyD,KAAK,CAACZ,YAAY,EAAEG,CAAC,CAAC,CACjC;IAEH,MAAMU,aAAa,GAAIV,CAAU,IAC/BrD,MAAM,CAAC6D,OAAO,CAACvD,GAAG,CAACc,GAAG,CAAC+B,KAAK,CAAC,EAAEA,KAAK,IAClCA,KAAK,gCACD9C,KAAK,CAACyD,KAAK,CAACd,aAAa,EAAEK,CAAC,CAAC,GAC7BrD,MAAM,CAACgE,OAAO,CAAC,KAAK,CAAC,CAC1B;IAEH,MAAMC,YAAY,GAAIZ,CAAU,IAAKhD,KAAK,CAACyD,KAAK,CAACd,aAAa,EAAEK,CAAC,CAAC;IAElE,MAAMa,MAAM,GAAGd,QAAQ,yBAAiB,CAACe,IAAI,CAC3CnE,MAAM,CAACoE,QAAQ,CAAC/D,KAAK,CAACgE,OAAO,CAACnB,YAAY,CAAC,CAAC,EAC5ClD,MAAM,CAACsE,GAAG,CAACpC,CAAC,IAAI7B,KAAK,CAACkE,QAAQ,CAACvB,aAAa,EAAEd,CAAC,CAAC,CAAC,EACjDlC,MAAM,CAACwE,MAAM,CACd;IAED,MAAMC,YAAY,GAAGpE,KAAK,CAACgE,OAAO,CAACrB,aAAa,CAAC,CAACmB,IAAI,CACpDnE,MAAM,CAACsE,GAAG,CAACI,IAAI,IACbrE,KAAK,CAACkE,QAAQ,CACZrB,YAAY,EACZ1C,KAAK,CAACmE,MAAM,CACVD,IAAI,EACJE,GAAG,IACDA,GAAG,KAAKC,aAAS,IACjBD,GAAG,CAACE,EAAE,+CACNF,GAAG,CAACE,EAAE,6CACNF,GAAG,CAACE,EAAE,4CAAoC,CAC7C,CACF,CACF,EACD9E,MAAM,CAACoE,QAAQ,CAAChB,QAAQ,0BAAkB,CAAC,CAC5C;IAED,MAAM2B,MAAM,GAAG,OAAO7C,CAAC,CAACM,GAAG,CAACI,OAAO,CAAC;MAAEY,QAAQ;MAAEiB;IAAY,CAAE,CAAC,CAAC;IAEhE,MAAM,CAACO,WAAW,EAAEC,iBAAiB,CAAC,GAAG,OAAO/C,CAAC,CAC/CrC,KAAK,CAACqF,MAAM,CAAC7B,CAAC,IACZlD,MAAM,CAACgF,IAAI,CAAC9B,CAAC,CAAC,CAACc,IAAI,CACjBhE,MAAM,CAACwE,MAAM,CACVtB,CAAC,IACAA,CAAC,CAACyB,EAAE,+CAAuCzB,CAAC,CAAC+B,CAAC,KAAK,OAAO,CAC7D,EACDjF,MAAM,CAACkF,GAAG,CAAChC,CAAC,IAAIA,CAAC,CAACiC,CAAE,CAAC,CACtB,CACF,CACF;IACD,MAAM,CAACC,cAAc,EAAEC,oBAAoB,CAAC,GAAG,OAAOtD,CAAC,CACrDrC,KAAK,CAACqF,MAAM,CAAC7B,CAAC,IAAIlD,MAAM,CAACsF,YAAY,CAACpC,CAAC,CAACqC,CAAC,CAAC,CAAC,CAC5C;IACD,MAAMC,cAAc,GAAItC,CAAyB,IAC/ClD,MAAM,CAACgF,IAAI,CAAC9B,CAAC,CAAC,CAACc,IAAI,CACjBhE,MAAM,CAACwE,MAAM,CACVtB,CAAC,IACAA,CAAC,CAACyB,EAAE,+CAAuCzB,CAAC,CAAC+B,CAAC,KAAK,OAAO,CAC7D,EACDjF,MAAM,CAACkF,GAAG,CAAChC,CAAC,IAAIA,CAAC,CAACiC,CAAE,CAAC,EACrBnF,MAAM,CAACyF,KAAK,CAAC;MACXC,MAAM,EAAEA,CAAA,KAAM7F,MAAM,CAAC8F,IAAI;MACzBC,MAAM,EAAEA,CAAC;QAAEC;MAAkB,CAAE,KAC7BjB,MAAM,CAACkB,MAAM,CAACD,kBAAkB;KACnC,CAAC,CACH;IAEH,MAAME,MAAM,GAAG,OAAOhE,CAAC,CAAC7B,KAAK,CAAC4C,SAAS,EAA0B,CAAC;IAClE,MAAMkD,IAAI,GAAG,OAAOjE,CAAC,CAAC7B,KAAK,CAAC4C,SAAS,EAA0B,CAAC;IAEhE;IACA,MAAMmD,UAAU,GAAG3G,UAAU,CAACmE,IAAI,CAChCsC,MAAM,EACNC,IAAI,EACJZ,cAAc,EACdxB,aAAa,CACd;IAED;IACA,MAAMsC,QAAQ,GAAG1G,QAAQ,CAAC2G,gBAAgB,CACxC;MACElE,KAAK,EAAE3B,YAAY,CAAC8F,KAAK,CAACnE,KAAK,CAAC;MAChCS,KAAK;MACL2D,OAAO,EAAErE,OAAO,CAACqE,OAAO;MACxBC,QAAQ,EAAEtE,OAAO,CAACsE;KACnB,EACDzB,WAAW,EACXO,cAAc,CACf;IAED,MAAMmB,SAAS,GAAIrD,CAAyB,IAC1CrD,MAAM,CAACsE,GAAG,CACRtE,MAAM,CAAC2G,GAAG,CACR,CAAC1B,iBAAiB,CAAC5B,CAAC,CAAC,EAAEmC,oBAAoB,CAACnC,CAAC,CAAC,EAAEsC,cAAc,CAACtC,CAAC,CAAC,CAAC,EAClE;MAAEuD,OAAO,EAAE;IAAI,CAAE,CAClB,EACD,MAAK;MACH,QAAQvD,CAAC,CAACyB,EAAE;QACV;UACE,OAAO9E,MAAM,CAAC2G,GAAG,CACf,CACE3G,MAAM,CAACsE,GAAG,CAAC+B,QAAQ,EAAEpC,YAAY,CAAC,EAClCb,QAAQ,yBAAiB,EACzB/C,KAAK,CAACyD,KAAK,CAACoC,MAAM,EAAE7C,CAAC,CAAC,CACvB,EACD;YAAEuD,OAAO,EAAE;UAAI,CAAE,CAClB;QACH;UACE,OAAOvG,KAAK,CAACyD,KAAK,CAACqC,IAAI,EAAE9C,CAAC,CAAC;QAC7B;UACE,OAAOrD,MAAM,CAACsE,GAAG,CACf1E,cAAc,CAACiH,WAAW,CAACxD,CAAC,EAAE2B,WAAW,CAAC,EAC1CpB,IAAI,CACL;QACH;UACE,IAAIP,CAAC,CAAC+B,CAAC,KAAK,OAAO,IAAI/B,CAAC,CAAC+B,CAAC,KAAK,SAAS,EAAE;YACxC,OAAOpF,MAAM,CAACoE,QAAQ,CAACF,MAAM,EAAE9D,GAAG,CAAC0G,OAAO,CAAChE,GAAG,EAAEO,CAAC,CAAC,CAAC;;UAErD,OAAOjD,GAAG,CAAC0G,OAAO,CAAChE,GAAG,EAAEO,CAAC,CAAC;;MAG9B,OAAOrD,MAAM,CAAC8F,IAAI;IACpB,CAAC,CACF;IAEH,MAAMiB,cAAc,GAAG1G,KAAK,CAACoD,IAAI,CAACV,SAAS,CAAC,CAACoB,IAAI,CAC/CnE,MAAM,CAACsE,GAAG,CAACV,IAAI,CAAC,EAChB5D,MAAM,CAACgH,OAAO,CACf;IAED,MAAMC,GAAG,GAAGjH,MAAM,CAAC2G,GAAG,CACpB,CACE5B,MAAM,CAACtB,IAAI,CAACU,IAAI,CAACnE,MAAM,CAAC6D,OAAO,CAAC6C,SAAS,CAAC,EAAE1G,MAAM,CAACgH,OAAO,CAAC,EAC3DZ,UAAU,EACVW,cAAc,EACdhC,MAAM,CAACkC,GAAG,CACX,EACD;MAAEL,OAAO,EAAE,IAAI;MAAEM,WAAW,EAAE;IAAW,CAAE,CAC5C;IAED,OAAO;MAAEC,EAAE,EAAEtE,KAAK;MAAEe,IAAI;MAAEqD;IAAG,CAAW;EAC1C,CAAC,CAAC;EAEJ,OAAO;IAAErE;EAAO,CAAW;AAC7B,CAAC,CAAC;AAAAwE,OAAA,CAAApF,IAAA,GAAAA,IAAA;AAGK,MAAMqF,KAAK,gBAAG,IAAAC,YAAG,GAAS;AAAAF,OAAA,CAAAC,KAAA,GAAAA,KAAA;AAC1B,MAAME,SAAS,gBAAGtH,KAAK,CAACuH,OAAO,eACpCvH,KAAK,CAACwH,KAAK,CAACC,wBAAa,EAAEC,0BAAe,CAAC,eAC3C1H,KAAK,CAAC2H,MAAM,CAACP,KAAK,EAAErF,IAAI,CAAC,CAC1B;AAAAoF,OAAA,CAAAG,SAAA,GAAAA,SAAA"}
1
+ {"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_RateLimit","_DiscordWS","Heartbeats","_interopRequireWildcard","Identify","InvalidSession","Utils","_WS","_Log","Effect","Layer","_Context","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","gen","_","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","log","Log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","debug","outbound","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","Reconnect","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","fromPayload","publish","drainSendQueue","forever","run","all","discard","concurrency","id","exports","Shard","Tag","LiveShard","provide","merge","LiveDiscordWS","LiveRateLimiter","effect"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -12,13 +12,13 @@ import type { WebSocketCloseError, WebSocketError } from "dfx/DiscordGateway/WS"
12
12
  import { DiscordREST } from "dfx/DiscordREST";
13
13
  import { RateLimiter } from "dfx/RateLimit";
14
14
  import type * as Discord from "dfx/types";
15
- declare const make: Effect.Effect<DiscordConfig | RateLimiter | DiscordREST | ShardStore | Shard, never, {
15
+ declare const make: Effect.Effect<DiscordConfig | RateLimiter | DiscordREST | Shard | ShardStore, never, {
16
16
  readonly shards: Effect.Effect<never, never, HashSet.HashSet<RunningShard>>;
17
17
  readonly run: (hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, WebSocketError | WebSocketCloseError, never>;
18
18
  }>;
19
19
  export interface Sharder extends Effect.Effect.Success<typeof make> {
20
20
  }
21
21
  export declare const Sharder: Tag<Sharder, Sharder>;
22
- export declare const LiveSharder: Layer.Layer<DiscordConfig | import("../Log").Log | import("dfx/RateLimit").RateLimitStore | DiscordREST | ShardStore | import("./DiscordWS").DiscordWSCodec, never, Sharder>;
22
+ export declare const LiveSharder: Layer.Layer<DiscordConfig | import("../Log").Log | import("dfx/RateLimit").RateLimitStore | DiscordREST | import("./DiscordWS").DiscordWSCodec | ShardStore, never, Sharder>;
23
23
  export {};
24
24
  //# sourceMappingURL=Sharder.d.ts.map
@@ -17,5 +17,5 @@ export interface DiscordGateway {
17
17
  }
18
18
  export declare const DiscordGateway: Tag<DiscordGateway, DiscordGateway>;
19
19
  export declare const make: Effect.Effect<Sharder, never, DiscordGateway>;
20
- export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec, never, DiscordGateway>;
20
+ export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/DiscordWS").DiscordWSCodec | import("./DiscordGateway/ShardStore").ShardStore, never, DiscordGateway>;
21
21
  //# sourceMappingURL=DiscordGateway.d.ts.map
package/DiscordREST.js CHANGED
@@ -52,10 +52,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
52
52
  // Invalid route handling (40x)
53
53
  const badRoutesRef = yield* _(Ref.make(HashSet.empty()));
54
54
  const tenMinutes = Duration.toMillis(Duration.minutes(10));
55
- const addBadRoute = route => Effect.all([log.info("DiscordREST", "addBadRoute", route), Ref.update(badRoutesRef, HashSet.add(route)), store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)], {
56
- discard: true,
57
- concurrency: "unbounded"
58
- });
55
+ const addBadRoute = route => log.info("DiscordREST", "addBadRoute", route).pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)));
59
56
  const isBadRoute = route => Effect.map(Ref.get(badRoutesRef), HashSet.has(route));
60
57
  const removeBadRoute = route => Ref.update(badRoutesRef, HashSet.remove(route));
61
58
  const invalidRateLimit = route => isBadRoute(route).pipe(Effect.tap(invalid => invalid ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000) : Effect.unit), Effect.asUnit);
@@ -106,10 +103,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
106
103
  discard: true
107
104
  }), Effect.fail(e));
108
105
  case 429:
109
- return Effect.zipRight(Effect.all([log.info("DiscordREST", "429", request.url), addBadRoute((0, _utils.routeFromConfig)(request.url, request.method)), updateBuckets(request, response), Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))], {
110
- concurrency: "unbounded",
111
- discard: true
112
- }), executor(request));
106
+ return log.info("DiscordREST", "429", request.url).pipe(Effect.zipRight(addBadRoute((0, _utils.routeFromConfig)(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
113
107
  }
114
108
  return Effect.fail(e);
115
109
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"DiscordREST.js","names":["Http","_interopRequireWildcard","require","_Context","Duration","HashSet","Option","ConfigSecret","Effect","Layer","Ref","_DiscordConfig","_utils","_Log","_RateLimit","Discord","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","HttpRequestExecutor","log","Log","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","all","info","update","add","incrementCounter","discard","concurrency","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","pipe","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","zipRight","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","LIB_VERSION","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","Tag","LiveDiscordREST","provide","LiveRateLimiter","effect"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"DiscordREST.js","names":["Http","_interopRequireWildcard","require","_Context","Duration","HashSet","Option","ConfigSecret","Effect","Layer","Ref","_DiscordConfig","_utils","_Log","_RateLimit","Discord","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","HttpRequestExecutor","log","Log","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","info","pipe","zipRight","update","add","incrementCounter","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","LIB_VERSION","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","Tag","LiveDiscordREST","provide","LiveRateLimiter","effect"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -16,7 +16,7 @@ export interface RunOpts {
16
16
  /**
17
17
  * @tsplus pipeable dfx/InteractionBuilder runGateway
18
18
  */
19
- export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<DiscordREST | R | Discord.Interaction, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.ResponseDecodeError | E2, never>;
19
+ export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<DiscordREST | Discord.Interaction | R, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.ResponseDecodeError | E2, never>;
20
20
  export interface InteractionsRegistry {
21
21
  readonly register: <E>(ix: InteractionBuilder<never, E, never>) => Effect.Effect<never, never, void>;
22
22
  readonly run: <R, E>(onError: (_: Cause<DiscordRESTError | DefinitionNotFound>) => Effect.Effect<R, E, void>, opts?: RunOpts) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R, Discord.Interaction>, DiscordRESTError | Http.ResponseDecodeError | E, never>;
@@ -59,14 +59,10 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
59
59
  intents: gateway.intents,
60
60
  presence: gateway.presence
61
61
  }, latestReady, latestSequence);
62
- const onPayload = p => Effect.tap(Effect.all([updateLatestReady(p), updateLatestSequence(p), maybeUpdateUrl(p)], {
63
- discard: true
64
- }), () => {
62
+ const onPayload = p => updateLatestReady(p).pipe(Effect.zipRight(updateLatestSequence(p)), Effect.zipRight(maybeUpdateUrl(p)), Effect.tap(() => {
65
63
  switch (p.op) {
66
64
  case 10 /* Discord.GatewayOpcode.HELLO */:
67
- return Effect.all([Effect.tap(identify, prioritySend), setPhase(1 /* Phase.Handshake */), Queue.offer(hellos, p)], {
68
- discard: true
69
- });
65
+ return Effect.tap(identify, prioritySend).pipe(Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(Queue.offer(hellos, p)));
70
66
  case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
71
67
  return Queue.offer(acks, p);
72
68
  case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
@@ -78,7 +74,7 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
78
74
  return Hub.publish(hub, p);
79
75
  }
80
76
  return Effect.unit;
81
- });
77
+ }));
82
78
  const drainSendQueue = Queue.take(sendQueue).pipe(Effect.tap(send), Effect.forever);
83
79
  const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
84
80
  discard: true,
@@ -1 +1 @@
1
- {"version":3,"file":"Shard.mjs","names":["DiscordConfig","LiveRateLimiter","RateLimiter","DiscordWS","LiveDiscordWS","Heartbeats","Identify","InvalidSession","Utils","Reconnect","Log","Effect","Layer","Tag","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","make","gen","_","gateway","token","limiter","dws","log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","debug","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","all","discard","fromPayload","publish","drainSendQueue","forever","run","concurrency","id","Shard","LiveShard","provide","merge","effect"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"Shard.mjs","names":["DiscordConfig","LiveRateLimiter","RateLimiter","DiscordWS","LiveDiscordWS","Heartbeats","Identify","InvalidSession","Utils","Reconnect","Log","Effect","Layer","Tag","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","make","gen","_","gateway","token","limiter","dws","log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","debug","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","fromPayload","publish","drainSendQueue","forever","run","all","discard","concurrency","id","Shard","LiveShard","provide","merge","effect"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -39,10 +39,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
39
39
  // Invalid route handling (40x)
40
40
  const badRoutesRef = yield* _(Ref.make(HashSet.empty()));
41
41
  const tenMinutes = Duration.toMillis(Duration.minutes(10));
42
- const addBadRoute = route => Effect.all([log.info("DiscordREST", "addBadRoute", route), Ref.update(badRoutesRef, HashSet.add(route)), store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)], {
43
- discard: true,
44
- concurrency: "unbounded"
45
- });
42
+ const addBadRoute = route => log.info("DiscordREST", "addBadRoute", route).pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)));
46
43
  const isBadRoute = route => Effect.map(Ref.get(badRoutesRef), HashSet.has(route));
47
44
  const removeBadRoute = route => Ref.update(badRoutesRef, HashSet.remove(route));
48
45
  const invalidRateLimit = route => isBadRoute(route).pipe(Effect.tap(invalid => invalid ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000) : Effect.unit), Effect.asUnit);
@@ -93,10 +90,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
93
90
  discard: true
94
91
  }), Effect.fail(e));
95
92
  case 429:
96
- return Effect.zipRight(Effect.all([log.info("DiscordREST", "429", request.url), addBadRoute(routeFromConfig(request.url, request.method)), updateBuckets(request, response), Effect.sleep(Option.getOrElse(retryAfter(response.headers), () => Duration.seconds(5)))], {
97
- concurrency: "unbounded",
98
- discard: true
99
- }), executor(request));
93
+ return log.info("DiscordREST", "429", request.url).pipe(Effect.zipRight(addBadRoute(routeFromConfig(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse(retryAfter(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
100
94
  }
101
95
  return Effect.fail(e);
102
96
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"DiscordREST.mjs","names":["Http","Tag","Duration","millis","HashSet","Option","ConfigSecret","Effect","Layer","Ref","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","Log","LiveRateLimiter","RateLimitStore","RateLimiter","Discord","LIB_VERSION","DiscordRESTError","error","body","_tag","constructor","ResponseDecodeError","make","gen","_","rest","token","http","HttpRequestExecutor","log","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","all","info","update","add","incrementCounter","discard","concurrency","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","pipe","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","zipRight","key","resetAfter","updateBuckets","response","url","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","LiveDiscordREST","provide","effect"],"sources":["../src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"DiscordREST.mjs","names":["Http","Tag","Duration","millis","HashSet","Option","ConfigSecret","Effect","Layer","Ref","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","Log","LiveRateLimiter","RateLimitStore","RateLimiter","Discord","LIB_VERSION","DiscordRESTError","error","body","_tag","constructor","ResponseDecodeError","make","gen","_","rest","token","http","HttpRequestExecutor","log","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","info","pipe","zipRight","update","add","incrementCounter","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","resetAfter","updateBuckets","response","url","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","all","concurrency","discard","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","LiveDiscordREST","provide","effect"],"sources":["../src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
package/mjs/version.mjs CHANGED
@@ -1,2 +1,2 @@
1
- export const LIB_VERSION = "0.52.0";
1
+ export const LIB_VERSION = "0.52.1";
2
2
  //# sourceMappingURL=version.mjs.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dfx",
3
- "version": "0.52.0",
3
+ "version": "0.52.1",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -17,7 +17,7 @@
17
17
  "utf-8-validate": "^6.0.3",
18
18
  "ws": "^8.13.0"
19
19
  },
20
- "gitHead": "06425762f03a78a366bfedf2c12261316f1e6e14",
20
+ "gitHead": "fedd1ba05f574a1b2009215ddd482e4b6dfcd48d",
21
21
  "main": "./index.js",
22
22
  "publishConfig": {
23
23
  "access": "public"
@@ -141,21 +141,15 @@ export const make = Effect.gen(function* (_) {
141
141
  )
142
142
 
143
143
  const onPayload = (p: Discord.GatewayPayload) =>
144
- Effect.tap(
145
- Effect.all(
146
- [updateLatestReady(p), updateLatestSequence(p), maybeUpdateUrl(p)],
147
- { discard: true },
148
- ),
149
- () => {
144
+ updateLatestReady(p).pipe(
145
+ Effect.zipRight(updateLatestSequence(p)),
146
+ Effect.zipRight(maybeUpdateUrl(p)),
147
+ Effect.tap(() => {
150
148
  switch (p.op) {
151
149
  case Discord.GatewayOpcode.HELLO:
152
- return Effect.all(
153
- [
154
- Effect.tap(identify, prioritySend),
155
- setPhase(Phase.Handshake),
156
- Queue.offer(hellos, p),
157
- ],
158
- { discard: true },
150
+ return Effect.tap(identify, prioritySend).pipe(
151
+ Effect.zipRight(setPhase(Phase.Handshake)),
152
+ Effect.zipRight(Queue.offer(hellos, p)),
159
153
  )
160
154
  case Discord.GatewayOpcode.HEARTBEAT_ACK:
161
155
  return Queue.offer(acks, p)
@@ -172,7 +166,7 @@ export const make = Effect.gen(function* (_) {
172
166
  }
173
167
 
174
168
  return Effect.unit
175
- },
169
+ }),
176
170
  )
177
171
 
178
172
  const drainSendQueue = Queue.take(sendQueue).pipe(
@@ -46,14 +46,14 @@ const make = Effect.gen(function* (_) {
46
46
  const badRoutesRef = yield* _(Ref.make(HashSet.empty<string>()))
47
47
  const tenMinutes = Duration.toMillis(Duration.minutes(10))
48
48
  const addBadRoute = (route: string) =>
49
- Effect.all(
50
- [
51
- log.info("DiscordREST", "addBadRoute", route),
52
- Ref.update(badRoutesRef, HashSet.add(route)),
53
- store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000),
54
- ],
55
- { discard: true, concurrency: "unbounded" },
56
- )
49
+ log
50
+ .info("DiscordREST", "addBadRoute", route)
51
+ .pipe(
52
+ Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))),
53
+ Effect.zipRight(
54
+ store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000),
55
+ ),
56
+ )
57
57
  const isBadRoute = (route: string) =>
58
58
  Effect.map(Ref.get(badRoutesRef), HashSet.has(route))
59
59
  const removeBadRoute = (route: string) =>
@@ -185,22 +185,22 @@ const make = Effect.gen(function* (_) {
185
185
  )
186
186
 
187
187
  case 429:
188
- return Effect.zipRight(
189
- Effect.all(
190
- [
191
- log.info("DiscordREST", "429", request.url),
188
+ return log
189
+ .info("DiscordREST", "429", request.url)
190
+ .pipe(
191
+ Effect.zipRight(
192
192
  addBadRoute(routeFromConfig(request.url, request.method)),
193
- updateBuckets(request, response),
193
+ ),
194
+ Effect.zipRight(updateBuckets(request, response)),
195
+ Effect.zipRight(
194
196
  Effect.sleep(
195
197
  Option.getOrElse(retryAfter(response.headers), () =>
196
198
  Duration.seconds(5),
197
199
  ),
198
200
  ),
199
- ],
200
- { concurrency: "unbounded", discard: true },
201
- ),
202
- executor<A>(request),
203
- )
201
+ ),
202
+ Effect.zipRight(executor<A>(request)),
203
+ )
204
204
  }
205
205
 
206
206
  return Effect.fail(e)
package/src/version.ts CHANGED
@@ -1 +1 @@
1
- export const LIB_VERSION = "0.52.0";
1
+ export const LIB_VERSION = "0.52.1";
package/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare const LIB_VERSION = "0.52.0";
1
+ export declare const LIB_VERSION = "0.52.1";
2
2
  //# sourceMappingURL=version.d.ts.map
package/version.js CHANGED
@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.LIB_VERSION = void 0;
7
- const LIB_VERSION = "0.52.0";
7
+ const LIB_VERSION = "0.52.1";
8
8
  exports.LIB_VERSION = LIB_VERSION;
9
9
  //# sourceMappingURL=version.js.map