dfx 0.77.3 → 0.78.0

package/src/Interactions/webhook.ts

@@ -11,7 +11,10 @@ import * as Layer from "effect/Layer"
 import type * as D from "dfx/Interactions/definitions"
 import type { DefinitionNotFound } from "dfx/Interactions/handlers"
 import { handlers } from "dfx/Interactions/handlers"
-import type { InteractionBuilder } from "dfx/Interactions/index"
+import type {
+  DiscordInteraction,
+  InteractionBuilder,
+} from "dfx/Interactions/index"
 import { Interaction } from "dfx/Interactions/index"
 import type * as Discord from "dfx/types"
 import * as Verify from "discord-verify"
@@ -68,8 +71,12 @@ const makeConfig = ({
   algorithm: Verify.PlatformAlgorithm[algorithm],
 })
 
-export interface WebhookConfig extends ReturnType<typeof makeConfig> {}
-export const WebhookConfig = Tag<WebhookConfig>()
+export interface WebhookConfig {
+  readonly _: unique symbol
+}
+export const WebhookConfig = Tag<WebhookConfig, ReturnType<typeof makeConfig>>(
+  "dfx/Interactions/WebhookConfig",
+)
 
 export const layer = (opts: MakeConfigOpts) =>
   Layer.succeed(WebhookConfig, makeConfig(opts))
@@ -112,7 +119,14 @@ const run = <R, E>(
   ) => Effect.Effect<R, E, Discord.InteractionResponse>,
 ) => {
   const handler = handlers(definitions, handleResponse)
-  return (headers: Headers, body: string) =>
+  return (
+    headers: Headers,
+    body: string,
+  ): Effect.Effect<
+    WebhookConfig | Exclude<R, DiscordInteraction>,
+    BadWebhookSignature | WebhookParseError | E | DefinitionNotFound,
+    Discord.InteractionResponse
+  > =>
     Effect.flatMap(fromHeadersAndBody(headers, body), interaction =>
       Effect.provideService(
         handler[interaction.type](interaction),

package/src/RateLimit/memory.ts

@@ -1,13 +1,13 @@
 import * as Option from "effect/Option"
 import * as Effect from "effect/Effect"
-import type { BucketDetails, RateLimitStore } from "dfx/RateLimit"
+import type { BucketDetails, RateLimitStoreService } from "dfx/RateLimit"
 
 interface Counter {
   count: number
   expires: number
 }
 
-export const make = (): RateLimitStore => {
+export const make = (): RateLimitStoreService => {
   const buckets = new Map<string, BucketDetails>()
   const routes = new Map<string, string>()
   const counters = new Map<string, Counter>()

package/src/RateLimit.ts

@@ -3,7 +3,6 @@ import * as Duration from "effect/Duration"
 import type * as Option from "effect/Option"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import { Log } from "dfx/Log"
 import * as Memory from "dfx/RateLimit/memory"
 import { delayFrom } from "dfx/RateLimit/utils"
 
@@ -13,7 +12,7 @@ export type BucketDetails = {
   limit: number
 }
 
-export interface RateLimitStore {
+export interface RateLimitStoreService {
   readonly hasBucket: (
     bucketKey: string,
   ) => Effect.Effect<never, never, boolean>
@@ -40,12 +39,17 @@ export interface RateLimitStore {
   readonly removeCounter: (key: string) => Effect.Effect<never, never, void>
 }
 
-export const RateLimitStore = Tag<RateLimitStore>()
+export interface RateLimitStore {
+  readonly _: unique symbol
+}
+
+export const RateLimitStore = Tag<RateLimitStore, RateLimitStoreService>(
+  "dfx/RateLimit/RateLimitStore",
+)
 export const MemoryRateLimitStoreLive = Layer.sync(RateLimitStore, Memory.make)
 
 const makeLimiter = Effect.gen(function* (_) {
   const store = yield* _(RateLimitStore)
-  const log = yield* _(Log)
 
   const maybeWait = (
     key: string,
@@ -58,7 +62,8 @@ const makeLimiter = Effect.gen(function* (_) {
     return store.incrementCounter(key, windowMs, limit).pipe(
       Effect.map(([count, ttl]) => delayFrom(windowMs, limit, count, ttl)),
       Effect.tap(d =>
-        log.debug("RateLimitStore maybeWait", {
+        Effect.annotateLogs(Effect.logTrace("maybeWait"), {
+          service: "RateLimit",
           key,
           window: Duration.toMillis(window),
           windowMs,
@@ -76,7 +81,11 @@ const makeLimiter = Effect.gen(function* (_) {
   return { maybeWait }
 })
 
-export interface RateLimiter
-  extends Effect.Effect.Success<typeof makeLimiter> {}
-export const RateLimiter = Tag<RateLimiter>()
+export interface RateLimiter {
+  readonly _: unique symbol
+}
+export const RateLimiter = Tag<
+  RateLimiter,
+  Effect.Effect.Success<typeof makeLimiter>
+>("dfx/RateLimit/RateLimiter")
 export const RateLimiterLive = Layer.effect(RateLimiter, makeLimiter)

package/src/gateway.ts

@@ -9,7 +9,6 @@ import { MemoryShardStoreLive } from "dfx/DiscordGateway/ShardStore"
 import * as WS from "dfx/DiscordGateway/WS"
 import { DiscordRESTLive } from "dfx/DiscordREST"
 import { InteractionsRegistryLive } from "dfx/Interactions/gateway"
-import { LogLive } from "dfx/Log"
 import { MemoryRateLimitStoreLive, RateLimiterLive } from "dfx/RateLimit"
 import * as Layer from "effect/Layer"
 
@@ -33,7 +32,6 @@ export const DiscordLive = Layer.mergeAll(
   Layer.provide(JsonDiscordWSCodecLive),
   Layer.provide(MemoryRateLimitStoreLive),
   Layer.provide(MemoryShardStoreLive),
-  Layer.provideMerge(LogLive),
 )
 
 export const DiscordIxLive = InteractionsRegistryLive.pipe(

package/src/index.ts

@@ -7,7 +7,6 @@ import * as Members from "dfx/Helpers/members"
 import * as Perms from "dfx/Helpers/permissions"
 import * as UI from "dfx/Helpers/ui"
 import * as Ix from "dfx/Interactions/index"
-import * as Log from "dfx/Log"
 import * as Discord from "dfx/types"
 
 export { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST"
@@ -28,7 +27,6 @@ export {
   Intents,
   Ix,
   IxHelpers,
-  Log,
   Members,
   Perms,
   UI,

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.77.3";
+export const LIB_VERSION = "0.78.0";

package/src/webhooks.ts

@@ -1,5 +1,4 @@
 import { DiscordRESTLive } from "dfx/DiscordREST"
-import * as Log from "dfx/Log"
 import {
   MemoryRateLimitStoreLive as MemoryRateLimitStoreLive,
   RateLimiterLive as RateLimiterLive,
@@ -19,4 +18,4 @@ export {
 export const DiscordLive = Layer.mergeAll(
   DiscordRESTLive,
   RateLimiterLive,
-).pipe(Layer.provide(MemoryRateLimitStoreLive), Layer.provideMerge(Log.LogLive))
+).pipe(Layer.provide(MemoryRateLimitStoreLive))

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.77.3";
+export declare const LIB_VERSION = "0.78.0";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LIB_VERSION = void 0;
-const LIB_VERSION = exports.LIB_VERSION = "0.77.3";
+const LIB_VERSION = exports.LIB_VERSION = "0.78.0";
 //# sourceMappingURL=version.js.map

package/webhooks.d.ts

@@ -1,5 +1,4 @@
-import * as Log from "dfx/Log";
 import * as Layer from "effect/Layer";
 export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeHandler, makeSimpleHandler, layer as webhookLayer, layerConfig as webhookLayerConfig, } from "dfx/Interactions/webhook";
-export declare const DiscordLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, Log.Log | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST>;
+export declare const DiscordLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST>;
 //# sourceMappingURL=webhooks.d.ts.map

package/webhooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAK9B,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,iBAAiB,EACjB,KAAK,IAAI,YAAY,EACrB,WAAW,IAAI,kBAAkB,GAClC,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,WAAW,oJAGwD,CAAA"}
+{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,iBAAiB,EACjB,KAAK,IAAI,YAAY,EACrB,WAAW,IAAI,kBAAkB,GAClC,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,WAAW,0IAGuB,CAAA"}

package/webhooks.js

@@ -47,11 +47,10 @@ Object.defineProperty(exports, "webhookLayerConfig", {
   }
 });
 var _DiscordREST = /*#__PURE__*/require("dfx/DiscordREST");
-var Log = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Log"));
 var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
 var _webhook = /*#__PURE__*/require("dfx/Interactions/webhook");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const DiscordLive = exports.DiscordLive = /*#__PURE__*/Layer.mergeAll(_DiscordREST.DiscordRESTLive, _RateLimit.RateLimiterLive).pipe( /*#__PURE__*/Layer.provide(_RateLimit.MemoryRateLimitStoreLive), /*#__PURE__*/Layer.provideMerge(Log.LogLive));
+const DiscordLive = exports.DiscordLive = /*#__PURE__*/Layer.mergeAll(_DiscordREST.DiscordRESTLive, _RateLimit.RateLimiterLive).pipe( /*#__PURE__*/Layer.provide(_RateLimit.MemoryRateLimitStoreLive));
 //# sourceMappingURL=webhooks.js.map

package/webhooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.js","names":["_DiscordREST","require","Log","_interopRequireWildcard","_RateLimit","Layer","_webhook","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordLive","exports","mergeAll","DiscordRESTLive","RateLimiterLive","pipe","provide","MemoryRateLimitStoreLive","provideMerge","LogLive"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,gBAAAC,OAAA;AACA,IAAAC,GAAA,gBAAAC,uBAAA,eAAAF,OAAA;AACA,IAAAG,UAAA,gBAAAH,OAAA;AAIA,IAAAI,KAAA,gBAAAF,uBAAA,eAAAF,OAAA;AAEA,IAAAK,QAAA,gBAAAL,OAAA;AAQiC,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAL,wBAAAK,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE1B,MAAMY,WAAW,GAAAC,OAAA,CAAAD,WAAA,gBAAGvB,KAAK,CAACyB,QAAQ,CACvCC,4BAAe,EACfC,0BAAe,CAChB,CAACC,IAAI,eAAC5B,KAAK,CAAC6B,OAAO,CAACC,mCAAwB,CAAC,eAAE9B,KAAK,CAAC+B,YAAY,CAAClC,GAAG,CAACmC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"webhooks.js","names":["_DiscordREST","require","_RateLimit","Layer","_interopRequireWildcard","_webhook","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordLive","exports","mergeAll","DiscordRESTLive","RateLimiterLive","pipe","provide","MemoryRateLimitStoreLive"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,gBAAAC,OAAA;AACA,IAAAC,UAAA,gBAAAD,OAAA;AAIA,IAAAE,KAAA,gBAAAC,uBAAA,eAAAH,OAAA;AAEA,IAAAI,QAAA,gBAAAJ,OAAA;AAQiC,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE1B,MAAMY,WAAW,GAAAC,OAAA,CAAAD,WAAA,gBAAGxB,KAAK,CAAC0B,QAAQ,CACvCC,4BAAe,EACfC,0BAAe,CAChB,CAACC,IAAI,eAAC7B,KAAK,CAAC8B,OAAO,CAACC,mCAAwB,CAAC,CAAC"}

package/src/Log.ts

@@ -1,24 +0,0 @@
-import { DiscordConfig } from "dfx/DiscordConfig"
-import { Tag } from "effect/Context"
-import * as Effect from "effect/Effect"
-import * as Layer from "effect/Layer"
-
-const make = (debug = false) => ({
-  info: (...args: Array<any>) =>
-    Effect.sync(() => {
-      console.error("INFO", ...args)
-    }),
-  debug: (...args: Array<any>) =>
-    debug
-      ? Effect.sync(() => {
-          console.error("DEBUG", ...args)
-        })
-      : Effect.unit,
-})
-
-export interface Log extends ReturnType<typeof make> {}
-export const Log = Tag<Log>()
-export const LogLive = Layer.effect(
-  Log,
-  Effect.map(DiscordConfig, config => make(config.debug)),
-)