equipped 5.3.1 → 5.3.3

package/dist/types/{base-BDTBLZ9a.d.ts → base-BnwwLupM.d.ts}

@@ -5,7 +5,7 @@ import TestAgent from 'supertest/lib/agent';
 import { Pipe, PipeOutput } from 'valleyed';
 import { EventBus } from './events/index.js';
 import { A as AuthUser } from './overrides-6Hxg764S.js';
-import { d as RouteDef, j as RouterConfig, i as RouteConfig, l as RouteDefHandler, k as MergeRouteDefs, e as Route, R as Request, a as Response, M as MethodsEnum } from './requestError-DdaL8hc3.js';
+import { d as RouteDef, j as RouterConfig, i as RouteConfig, l as RouteDefHandler, k as MergeRouteDefs, e as Route, R as Request, a as Response, M as MethodsEnum } from './requestError-BmOhSuFb.js';
 import { IncomingHttpHeaders } from 'node:http2';
 import { Server as Server$1 } from 'socket.io';
 import { E as Entity } from './core-tNlIMH9Y.js';
@@ -61,7 +61,7 @@ declare const serverConfigPipe: () => Pipe<{
     port: number;
     cors: {
         origin: true | string[] | undefined;
-        methods: ("get" | "delete" | "head" | "options" | "post" | "put" | "patch")[] | undefined;
+        methods: ("head" | "get" | "post" | "put" | "patch" | "delete" | "options")[] | undefined;
         credentials: boolean | undefined;
     } | undefined;
     eventBus: EventBus | undefined;
@@ -91,7 +91,7 @@ declare const serverConfigPipe: () => Pipe<{
     port: number;
     cors: {
         origin: true | string[] | undefined;
-        methods: ("get" | "delete" | "head" | "options" | "post" | "put" | "patch")[] | undefined;
+        methods: ("head" | "get" | "post" | "put" | "patch" | "delete" | "options")[] | undefined;
         credentials: boolean | undefined;
     } | undefined;
     eventBus: EventBus | undefined;

package/dist/types/cache/adapters/in-memory/index.js

@@ -1,10 +1,13 @@
 import {
   Cache
-} from "../../../chunk-LPB5LS7A.js";
+} from "../../../chunk-BKXNLF6X.js";
+import "../../../chunk-7MXHWHRV.js";
 import {
-  Instance,
   configurable
-} from "../../../chunk-TT5EORDK.js";
+} from "../../../chunk-PPD4WDG6.js";
+import {
+  Instance
+} from "../../../chunk-YGIIUOQM.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 

package/dist/types/cache/adapters/redis/index.js

@@ -1,9 +1,11 @@
 import {
   RedisCache,
   redisConfigPipe
-} from "../../../chunk-YLJNBL6J.js";
-import "../../../chunk-LPB5LS7A.js";
-import "../../../chunk-TT5EORDK.js";
+} from "../../../chunk-GQRSK2KP.js";
+import "../../../chunk-BKXNLF6X.js";
+import "../../../chunk-7MXHWHRV.js";
+import "../../../chunk-PPD4WDG6.js";
+import "../../../chunk-YGIIUOQM.js";
 import "../../../chunk-KZKFYO4V.js";
 import "../../../chunk-MLKGABMK.js";
 export {

package/dist/types/cache/index.js

@@ -1,7 +1,7 @@
 import {
   Cache
-} from "../chunk-LPB5LS7A.js";
-import "../chunk-TT5EORDK.js";
+} from "../chunk-BKXNLF6X.js";
+import "../chunk-YGIIUOQM.js";
 import "../chunk-KZKFYO4V.js";
 import "../chunk-MLKGABMK.js";
 export {

package/dist/types/chunk-7MXHWHRV.js

@@ -0,0 +1,134 @@
+import {
+  EquippedError,
+  Instance
+} from "./chunk-YGIIUOQM.js";
+import {
+  __export
+} from "./chunk-MLKGABMK.js";
+
+// src/utilities/authProviders.ts
+var authProviders_exports = {};
+__export(authProviders_exports, {
+  signinWithApple: () => signinWithApple,
+  signinWithFacebook: () => signinWithFacebook,
+  signinWithGoogle: () => signinWithGoogle
+});
+import axios from "axios";
+import jwt from "jsonwebtoken";
+import jwksClient from "jwks-rsa";
+var signinWithGoogle = async (idToken) => {
+  const authUrl = `https://oauth2.googleapis.com/tokeninfo?id_token=${idToken}`;
+  const { data } = await axios.get(authUrl).catch((err) => {
+    throw new EquippedError("Failed to sign in with google", { idToken }, err);
+  });
+  data.first_name = data.given_name;
+  data.last_name = data.family_name;
+  return data;
+};
+var signinWithApple = async (idToken) => {
+  try {
+    const APPLE_BASE = "https://appleid.apple.com";
+    const json = jwt.decode(idToken, { complete: true });
+    if (!json?.header) throw new EquippedError("Missing JWT header", { idToken, json });
+    const { kid, alg } = json.header;
+    const publicKey = await jwksClient({ jwksUri: `${APPLE_BASE}/auth/keys`, cache: true }).getSigningKey(kid).then((key) => key.getPublicKey()).catch(() => null);
+    if (!publicKey) throw new EquippedError("no publicKey", { idToken, publicKey, json });
+    const data = jwt.verify(idToken, publicKey, { algorithms: [alg] });
+    if (!data) throw new EquippedError("no data", { idToken, data });
+    if (data.iss !== APPLE_BASE) throw new EquippedError("iss doesnt match", { idToken, data });
+    if (data.exp * 1e3 < Date.now()) throw new EquippedError("expired idToken", { idToken, data });
+    return data;
+  } catch (err) {
+    throw new EquippedError("Failed to sign in with apple", { idToken }, err);
+  }
+};
+var signinWithFacebook = async (accessToken, fields = []) => {
+  fields = [.../* @__PURE__ */ new Set([...fields, "name", "picture", "email"])];
+  const { data } = await axios.request({
+    method: "get",
+    url: "https://graph.facebook.com/v15.0/me",
+    params: {
+      fields: fields.join(","),
+      access_token: accessToken
+    }
+  }).catch((err) => {
+    throw new EquippedError("Failed to sign in with facebook", { accessToken, fields }, err);
+  });
+  const isValidData = fields.every((key) => key in data);
+  if (!isValidData) throw new EquippedError("Incomplete scope for access token", { accessToken, fields, data });
+  data.email_verified = "true";
+  return data;
+};
+
+// src/utilities/hash.ts
+var hash_exports = {};
+__export(hash_exports, {
+  compare: () => compare2,
+  hash: () => hash2
+});
+import * as bcrypt from "bcryptjs";
+var hash2 = async (password) => {
+  password = password.trim();
+  if (!password) return "";
+  return await bcrypt.hash(password, Instance.get().settings.utils.hashSaltRounds);
+};
+var compare2 = async (plainPassword, hashed) => {
+  plainPassword = plainPassword.trim();
+  if (!plainPassword && plainPassword === hashed) return true;
+  return await bcrypt.compare(plainPassword, hashed);
+};
+
+// src/utilities/json.ts
+var parseJSONValue = (data) => {
+  try {
+    if (data?.constructor?.name !== "String") return data;
+    return JSON.parse(data);
+  } catch {
+    return data;
+  }
+};
+
+// src/utilities/media.ts
+import { parseBuffer } from "music-metadata";
+var getMediaDuration = async (buffer) => {
+  try {
+    const meta = await parseBuffer(buffer);
+    return meta.format.duration ?? 0;
+  } catch {
+    return 0;
+  }
+};
+
+// src/utilities/random.ts
+var random_exports = {};
+__export(random_exports, {
+  number: () => number,
+  string: () => string
+});
+import crypto from "crypto";
+function string(length = 20) {
+  return crypto.randomBytes(length).toString("hex").slice(0, length);
+}
+function number(min = 0, max = 2 ** 48 - 1) {
+  return crypto.randomInt(min, max);
+}
+
+// src/utilities/retry.ts
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var retry = async (cb, tries, waitTimeInMs) => {
+  if (tries <= 0) throw new EquippedError("out of tries", { tries, waitTimeInMs });
+  const result = await cb();
+  if (result.done === true) return result.value;
+  await sleep(waitTimeInMs);
+  return await retry(cb, tries - 1, waitTimeInMs);
+};
+
+export {
+  authProviders_exports,
+  hash_exports,
+  parseJSONValue,
+  getMediaDuration,
+  random_exports,
+  sleep,
+  retry
+};

package/dist/types/{chunk-LPB5LS7A.js → chunk-BKXNLF6X.js}

@@ -1,6 +1,6 @@
 import {
   Instance
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-YGIIUOQM.js";
 
 // src/cache/adapters/base.ts
 var Cache = class {

package/dist/types/{chunk-J3TGB5YQ.js → chunk-DZFKDZDZ.js}

@@ -1,10 +1,14 @@
 import {
-  EquippedError,
-  Instance,
-  configurable,
   parseJSONValue,
   random_exports
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-7MXHWHRV.js";
+import {
+  configurable
+} from "./chunk-PPD4WDG6.js";
+import {
+  EquippedError,
+  Instance
+} from "./chunk-YGIIUOQM.js";
 import {
   EventBus
 } from "./chunk-KZKFYO4V.js";

package/dist/types/{chunk-YLJNBL6J.js → chunk-GQRSK2KP.js}

@@ -1,11 +1,13 @@
 import {
   Cache
-} from "./chunk-LPB5LS7A.js";
+} from "./chunk-BKXNLF6X.js";
 import {
-  EquippedError,
-  Instance,
   configurable
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-PPD4WDG6.js";
+import {
+  EquippedError,
+  Instance
+} from "./chunk-YGIIUOQM.js";
 
 // src/cache/adapters/redis/index.ts
 import { Cluster, Redis } from "ioredis";

package/dist/types/chunk-PPD4WDG6.js

@@ -0,0 +1,143 @@
+// src/utilities/configurable.ts
+import { v } from "valleyed";
+function configurable(pipeFn, base) {
+  const pipe = pipeFn();
+  v.compile(pipe);
+  class Configurable extends base {
+    constructor(config, ...baseArgs) {
+      super(...baseArgs);
+      this.config = config;
+    }
+    static create(input, ...args) {
+      const r = v.validate(pipe, input);
+      if (!r.valid) throw r.error;
+      return new this(r.value, ...args);
+    }
+  }
+  return Configurable;
+}
+if (void 0) {
+  const { describe, test, expect, expectTypeOf } = void 0;
+  const { v: v2 } = await null;
+  const testPipe = () => v2.object({
+    host: v2.string(),
+    port: v2.number()
+  });
+  class TestBase {
+    baseValue;
+    constructor() {
+      this.baseValue = "base";
+    }
+  }
+  class TestBaseWithArgs {
+    label;
+    constructor(label) {
+      this.label = label;
+    }
+  }
+  describe("configurable", () => {
+    test("validation runs in static create before constructor body executes", () => {
+      let constructorRan = false;
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+          constructorRan = true;
+        }
+      }
+      expect(() => MyClass.create({ host: 123, port: "bad" })).toThrow();
+      expect(constructorRan).toBe(false);
+      MyClass.create({ host: "localhost", port: 3e3 });
+      expect(constructorRan).toBe(true);
+    });
+    test("constructor receives validated value", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      let receivedConfig;
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+          receivedConfig = this.config;
+        }
+      }
+      MyClass.create({ host: "localhost", port: 3e3 });
+      expect(receivedConfig).toEqual({ host: "localhost", port: 3e3 });
+    });
+    test("external new is a compile error", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+      }
+      void (() => new MyClass({ host: "localhost", port: 3e3 }));
+    });
+    test("static Config resolves to PipeOutput<P> at the type level", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+      }
+      expectTypeOf().toEqualTypeOf();
+      expect(MyClass.create).toBeTypeOf("function");
+    });
+    test("ConstructorParameters<This>-based extras inference works for non-zero-arg leaf signatures", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        extra;
+        constructor(config, extra) {
+          super(config);
+          this.extra = extra;
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 }, 42);
+      expect(instance.extra).toBe(42);
+      expectTypeOf(instance).toHaveProperty("extra");
+      expectTypeOf(instance.extra).toEqualTypeOf();
+      void (() => MyClass.create({ host: "localhost", port: 3e3 }, "not-a-number"));
+    });
+    test("base-args forwarding works for non-zero-arg bases", () => {
+      const Wrapped = configurable(testPipe, TestBaseWithArgs);
+      class MyClass extends Wrapped {
+        constructor(config, label) {
+          super(config, label);
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 }, "test-label");
+      expect(instance.label).toBe("test-label");
+    });
+    test("config is accessible as protected readonly on instances", () => {
+      const Wrapped = configurable(testPipe, TestBase);
+      class MyClass extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+        getHost() {
+          return this.config.host;
+        }
+      }
+      const instance = MyClass.create({ host: "localhost", port: 3e3 });
+      expect(instance.getHost()).toBe("localhost");
+    });
+    test("accepts an abstract base class", () => {
+      class AbstractBase {
+      }
+      const Wrapped = configurable(testPipe, AbstractBase);
+      class Concrete extends Wrapped {
+        constructor(config) {
+          super(config);
+        }
+        greet() {
+          return `hello from ${this.config.host}`;
+        }
+      }
+      const instance = Concrete.create({ host: "localhost", port: 3e3 });
+      expect(instance.greet()).toBe("hello from localhost");
+      expectTypeOf(instance).toHaveProperty("config");
+    });
+  });
+}
+
+export {
+  configurable
+};

package/dist/types/{chunk-55CTVK7R.js → chunk-SZAA5GF6.js}

@@ -1,6 +1,6 @@
 import {
   EquippedError
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-YGIIUOQM.js";
 
 // src/orm/errors/introspection.ts
 var OrmIntrospectionError = class extends EquippedError {

package/dist/types/{chunk-4DH3POYM.js → chunk-UGLZIYAR.js}

@@ -1,3 +1,6 @@
+import {
+  configurable
+} from "./chunk-PPD4WDG6.js";
 import {
   Filter,
   FilterGroup,
@@ -11,10 +14,7 @@ import {
   PushOp,
   SetOp,
   UnsetOp
-} from "./chunk-5Z26ZURE.js";
-import {
-  configurable
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-UR7O43FC.js";
 
 // src/orm/adapters/in-memory/index.ts
 import { AsyncLocalStorage } from "async_hooks";

package/dist/types/{chunk-5Z26ZURE.js → chunk-UR7O43FC.js}

@@ -1,7 +1,7 @@
 import {
   EquippedError,
   Instance
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-YGIIUOQM.js";
 
 // src/orm/errors/validation.ts
 var OrmValidationError = class extends EquippedError {

package/dist/types/{chunk-IZDJDGOV.js → chunk-X5ZDIXCZ.js}

@@ -1,9 +1,9 @@
 import {
   KafkaEventBus
-} from "./chunk-J3TGB5YQ.js";
+} from "./chunk-DZFKDZDZ.js";
 import {
   Instance
-} from "./chunk-TT5EORDK.js";
+} from "./chunk-YGIIUOQM.js";
 
 // src/dbs/adapters/base/db.ts
 var Db = class {