dfx 0.17.7 → 0.17.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/DiscordGateway/DiscordWS/index.d.ts +2 -3
  2. package/DiscordGateway/DiscordWS/index.js +1 -3
  3. package/DiscordGateway/DiscordWS/index.js.map +1 -1
  4. package/DiscordGateway/WS/index.d.ts +1 -6
  5. package/DiscordGateway/WS/index.js +16 -23
  6. package/DiscordGateway/WS/index.js.map +1 -1
  7. package/Interactions/definitions.d.ts +11 -2
  8. package/package.json +2 -2
package/DiscordGateway/DiscordWS/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
1
  /// <reference types="ws" />
3
2
  import { Discord } from "dfx";
4
3
  import { WS } from "dfx/gateway";
@@ -14,8 +13,8 @@ export interface OpenOpts {
14
13
  }
15
14
  export interface DiscordWSCodec {
16
15
  type: "json" | "etf";
17
- encode: (p: Discord.GatewayPayload) => string | Buffer | ArrayBuffer;
18
- decode: (p: WebSocket.RawData) => Discord.GatewayPayload;
16
+ encode: (p: Discord.GatewayPayload) => string;
17
+ decode: (p: WebSocket.Data) => Discord.GatewayPayload;
19
18
  }
20
19
  export declare const DiscordWSCodec: import("../../global.js").Tag<DiscordWSCodec>;
21
20
  export declare const LiveJsonDiscordWSCodec: import("../../global.js").Layer<never, never, DiscordWSCodec>;
package/DiscordGateway/DiscordWS/index.js CHANGED
@@ -21,8 +21,6 @@ export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound
21
21
  return tsplus_module_9.flatMap(ws => tsplus_module_9.map(log => {
22
22
  const source = tsplus_module_7.map(encoding.decode)(tsplus_module_6.retry(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)))(tsplus_module_5.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
23
23
  return { source, setUrl };
24
- })(tsplus_module_9.service(tsplus_module_8.Log.Log)))(tsplus_module_10.WS.make(urlRef, take, {
25
- perMessageDeflate: false,
26
- }));
24
+ })(tsplus_module_9.service(tsplus_module_8.Log.Log)))(tsplus_module_10.WS.make(urlRef, take));
27
25
  })(tsplus_module_11.make(`${url}?v=${version}&encoding=${encoding.type}`)))(tsplus_module_9.service(DiscordWSCodec));
28
26
  //# sourceMappingURL=index.js.map
package/DiscordGateway/DiscordWS/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,CAAC,CAAC;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEL,QAAQ,4BACR,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,qBAAW,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAA1D,MAAM,CAAqD,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,iBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;mCACK,EAAE,wBAMF,GAAG;QACT,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EAD1C,EAAE,CACyC,CACL,CAKpD,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAVX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GALnC,iBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE;QACpB,iBAAiB,EAAE,KAAK;KACzB,CAAC;GATa,sBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAwBjD,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,CAAC,CAAC;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEL,QAAQ,4BACR,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,qBAAW,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAA1D,MAAM,CAAqD,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,iBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;mCACK,EAAE,wBAEF,GAAG;QACT,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EAD1C,EAAE,CACyC,CACL,CAKpD,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAVX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GAFxB,iBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;GANjB,sBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAoBjD,CAAA"}
package/DiscordGateway/WS/index.d.ts CHANGED
@@ -18,9 +18,4 @@ export declare class WebSocketCloseError {
18
18
  readonly _tag = "WebSocketCloseError";
19
19
  constructor(code: number, reason: string);
20
20
  }
21
- export declare class WebSocketWriteError {
22
- readonly reason: Error;
23
- readonly _tag = "WebSocketWriteError";
24
- constructor(reason: Error);
25
- }
26
- export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>, options?: WebSocket.ClientOptions) => import("../../global.js").Effect<import("../../Log/index.js").Log, never, import("callbag-effect-ts/Source").EffectSource<never, WebSocketError | WebSocketCloseError | WebSocketWriteError, WebSocket.RawData>>;
21
+ export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("../../global.js").Effect<import("../../Log/index.js").Log, never, import("callbag-effect-ts/Source").EffectSource<never, WebSocketError | WebSocketCloseError, WebSocket.Data>>;
package/DiscordGateway/WS/index.js CHANGED
@@ -12,9 +12,8 @@ import * as tsplus_module_11 from "callbag-effect-ts/Source/unwrapScope";
12
12
  import * as tsplus_module_12 from "callbag-effect-ts/Source/retry";
13
13
  import WebSocket from "isomorphic-ws";
14
14
  export const Reconnect = Symbol();
15
- const socket = (urlRef, options) => tsplus_module_1.acquireRelease(tsplus_module_1.map(url => new WebSocket(url, options))(tsplus_module_2.get(urlRef)), (ws) => tsplus_module_1.sync(() => {
15
+ const socket = (urlRef) => tsplus_module_1.acquireRelease(tsplus_module_1.map(url => new WebSocket(url))(tsplus_module_2.get(urlRef)), (ws) => tsplus_module_1.sync(() => {
16
16
  ws.close();
17
- ws.removeAllListeners();
18
17
  }));
19
18
  export class WebSocketError {
20
19
  reason;
@@ -33,47 +32,41 @@ export class WebSocketCloseError {
33
32
  }
34
33
  }
35
34
  const recv = (ws) => tsplus_module_3.async((emit) => {
36
- ws.on("message", (message) => {
37
- emit.data(message);
35
+ ws.addEventListener("message", (message) => {
36
+ emit.data(message.data);
38
37
  });
39
- ws.on("error", (cause) => {
38
+ ws.addEventListener("error", (cause) => {
40
39
  emit.fail(new WebSocketError(cause));
41
40
  });
42
- ws.on("close", (code, reason) => {
43
- emit.fail(new WebSocketCloseError(code, reason.toString("utf8")));
41
+ ws.addEventListener("close", (e) => {
42
+ emit.fail(new WebSocketCloseError(e.code, e.reason));
44
43
  });
44
+ return () => {
45
+ ;
46
+ ws.removeAllListeners?.();
47
+ };
45
48
  });
46
- export class WebSocketWriteError {
47
- reason;
48
- _tag = "WebSocketWriteError";
49
- constructor(reason) {
50
- this.reason = reason;
51
- }
52
- }
53
49
  const send = (ws, take) => tsplus_module_1.map(log => tsplus_module_7.drain(tsplus_module_6.tap((data) => tsplus_module_1.async((resume) => {
54
50
  if (data === Reconnect) {
55
51
  ws.close(1012, "reconnecting");
56
52
  resume(tsplus_module_1.fail(new WebSocketCloseError(1012, "reconnecting")));
57
53
  }
58
54
  else {
59
- ws.send(data, (err) => {
60
- resume(err
61
- ? tsplus_module_1.fail(new WebSocketWriteError(err))
62
- : tsplus_module_1.unit());
63
- });
55
+ ws.send(data);
56
+ resume(tsplus_module_1.unit());
64
57
  }
65
58
  }))(tsplus_module_6.tap((p) => log.debug("WS", "send", p))(tsplus_module_5.unwrap(tsplus_module_1.map(() => tsplus_module_4.repeatEffectOption(take))(tsplus_module_1.async((resume) => {
66
59
  if (ws.readyState & ws.OPEN) {
67
60
  resume(tsplus_module_1.unit());
68
61
  }
69
62
  else {
70
- ws.once("open", () => {
63
+ ws.addEventListener("open", () => {
71
64
  resume(tsplus_module_1.unit());
72
- });
65
+ }, { once: true });
73
66
  }
74
67
  })))))))(tsplus_module_1.service(tsplus_module_8.Log.Log));
75
- export const make = (url, takeOutbound, options) => tsplus_module_1.map(log => {
68
+ export const make = (url, takeOutbound) => tsplus_module_1.map(log => {
76
69
  const withLog = tsplus_module_1.provideService(tsplus_module_8.Log.Log)(log);
77
- return tsplus_module_12.retry(tsplus_module_9.recurWhile((e) => e._tag === "WebSocketCloseError" && e.code === 1012))(tsplus_module_11.unwrapScope(tsplus_module_1.flatMap(ws => tsplus_module_1.map(sendEffect => tsplus_module_10.merge(sendEffect)(recv(ws)))(withLog(send(ws, takeOutbound))))(socket(url, options))));
70
+ return tsplus_module_12.retry(tsplus_module_9.recurWhile((e) => e._tag === "WebSocketCloseError" && e.code === 1012))(tsplus_module_11.unwrapScope(tsplus_module_1.flatMap(ws => tsplus_module_1.map(sendEffect => tsplus_module_10.merge(sendEffect)(recv(ws)))(withLog(send(ws, takeOutbound))))(socket(url))));
78
71
  })(tsplus_module_1.service(tsplus_module_8.Log.Log));
79
72
  //# sourceMappingURL=index.js.map
package/DiscordGateway/WS/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":"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"}
package/Interactions/definitions.d.ts CHANGED
@@ -47,8 +47,8 @@ type CommandHandler<R, E, A = any> = Effect<R, E, Discord.InteractionResponse> |
47
47
  export interface CommandHelper<A> {
48
48
  resolve: <T>(name: AllResolvables<A>["name"], f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined) => Effect<Discord.Interaction, ResolvedDataNotFound, T>;
49
49
  option: (name: AllCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<Discord.ApplicationCommandInteractionDataOption>>;
50
- optionValue: (name: AllRequiredCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, string>;
51
- optionValueOptional: (name: AllCommandOptions<A>["name"]) => Effect<Discord.ApplicationCommandDatum, never, Maybe<string>>;
50
+ optionValue: <N extends AllRequiredCommandOptions<A>["name"]>(name: N) => Effect<Discord.ApplicationCommandDatum, never, CommandValue<A, N>>;
51
+ optionValueOptional: <N extends AllCommandOptions<A>["name"]>(name: N) => Effect<Discord.ApplicationCommandDatum, never, Maybe<CommandValue<A, N>>>;
52
52
  subCommands: <NER extends SubCommandNames<A> extends never ? never : Record<SubCommandNames<A>, Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect<Exclude<[
53
53
  NER[keyof NER]
54
54
  ] extends [
@@ -81,6 +81,15 @@ type SubCommandOptions<A> = Extract<Option<Exclude<SubCommands<A>["options"], un
81
81
  type: CommandOptionType;
82
82
  }>;
83
83
  type AllCommandOptions<A> = CommandOptions<A> | SubCommandOptions<A>;
84
+ type CommandWithName<A, N> = Extract<AllCommandOptions<A>, {
85
+ name: N;
86
+ }>;
87
+ type OptionTypeValue = {
88
+ [Discord.ApplicationCommandOptionType.BOOLEAN]: boolean;
89
+ [Discord.ApplicationCommandOptionType.INTEGER]: number;
90
+ [Discord.ApplicationCommandOptionType.NUMBER]: number;
91
+ };
92
+ type CommandValue<A, N> = CommandWithName<A, N>["type"] extends keyof OptionTypeValue ? OptionTypeValue[CommandWithName<A, N>["type"]] : string;
84
93
  type RequiredCommandOptions<A> = OptionsWithLiteral<A, {
85
94
  type: CommandOptionType;
86
95
  required: true;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dfx",
3
- "version": "0.17.7",
3
+ "version": "0.17.9",
4
4
  "type": "module",
5
5
  "publishConfig": {
6
6
  "access": "public",
@@ -49,5 +49,5 @@
49
49
  "@fp-ts/data": "^0.0.20"
50
50
  }
51
51
  },
52
- "gitHead": "6c36bdae0ae5fb003b8a275887e3f728034ca7b8"
52
+ "gitHead": "c21408ac8ba6dc63654a112fd5ce5f85471fbfbd"
53
53
  }