naystack 1.1.13-beta.3 → 1.1.13

package/dist/file/setup.esm.js

@@ -0,0 +1,172 @@
+// src/file/put.ts
+import { waitUntil as waitUntil2 } from "@vercel/functions";
+import { NextResponse as NextResponse3 } from "next/server";
+import { v4 } from "uuid";
+
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { NextResponse } from "next/server";
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/utils/errors.ts
+import { NextResponse as NextResponse2 } from "next/server";
+
+// src/auth/email/utils.ts
+var getUserContext = (refreshKey, signingKey, req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get("refresh")?.value;
+    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    if (userId) return { refreshUserID: userId };
+    return null;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
+
+// src/file/utils.ts
+import { createHash } from "crypto";
+import {
+  DeleteObjectCommand,
+  PutObjectCommand,
+  S3Client
+} from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { waitUntil } from "@vercel/functions";
+var getS3Client = (options) => new S3Client({
+  region: options.region,
+  credentials: {
+    accessKeyId: options.awsKey,
+    secretAccessKey: options.awsSecret
+  }
+});
+var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+function getHash(keys) {
+  return createHash("sha256").update(keys.join("/")).digest("hex");
+}
+var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+  const command = new PutObjectCommand({
+    Bucket,
+    Key: getHash(keys),
+    ACL: isPublic ? "public-read" : void 0
+  });
+  return getSignedUrl(client, command, { expiresIn: 300 });
+};
+var getFileURL = (options) => (keys) => {
+  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
+  return `${getURLPrefix(options)}${getHash(keys)}`;
+};
+var uploadImage = (client, options) => async (url, key, blob) => {
+  const photoBlob = blob || await fetch(url).then((file) => file.blob());
+  if (photoBlob) {
+    waitUntil(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
+    return getFileURL(options)(key);
+  }
+  return null;
+};
+var deleteImage = (client, options) => async (url) => {
+  const key = url.split(getURLPrefix(options))[1];
+  if (key) {
+    try {
+      await client.send(
+        new DeleteObjectCommand({
+          Bucket: options.bucket,
+          Key: key
+        })
+      );
+      return true;
+    } catch (e) {
+      console.error("ERROR", url, e);
+    }
+  }
+  return false;
+};
+var uploadFile = (client, Bucket) => async (file, key) => {
+  const fileBuffer = await file.arrayBuffer();
+  return client.send(
+    new PutObjectCommand({
+      Bucket,
+      Key: key,
+      ACL: "public-read",
+      Body: Buffer.from(fileBuffer),
+      ContentType: file.type,
+      ContentLength: file.size
+    })
+  );
+};
+
+// src/file/put.ts
+var getFileUploadPutRoute = (options, client) => async (req) => {
+  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.accessUserId)
+    return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
+  const formData = await req.formData();
+  const type = formData.get("type");
+  const sync = Boolean(formData.get("sync"));
+  const file = formData.get("file");
+  const data = formData.get("data");
+  const imageKey = v4();
+  const url = file ? getFileURL(options)(imageKey) : null;
+  const handleKeyProcessing = async () => {
+    if (file) await uploadFile(client, options.bucket)(file, imageKey);
+    if (!type || !ctx.accessUserId) return;
+    const { deleteURL, response } = await options.processFile({
+      url,
+      type,
+      userId: ctx.accessUserId,
+      data: typeof data === "string" ? JSON.parse(data) : void 0
+    });
+    if (deleteURL) await deleteImage(client, options)(deleteURL);
+    return response;
+  };
+  if (!sync) {
+    waitUntil2(handleKeyProcessing());
+    return NextResponse3.json({ url });
+  } else {
+    return NextResponse3.json({
+      url,
+      response: await handleKeyProcessing()
+    });
+  }
+};
+
+// src/file/setup.ts
+function setupFileUpload(options) {
+  const client = getS3Client(options);
+  return {
+    PUT: getFileUploadPutRoute(options, client),
+    getUploadFileURL: getUploadFileURL(client, options.bucket),
+    uploadImage: uploadImage(client, options),
+    deleteImage: deleteImage(client, options),
+    getFileURL: getFileURL(options),
+    uploadFile: uploadFile(client, options.bucket)
+  };
+}
+export {
+  setupFileUpload
+};

package/dist/file/utils.cjs.js

@@ -0,0 +1,104 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/file/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  deleteImage: () => deleteImage,
+  getFileURL: () => getFileURL,
+  getS3Client: () => getS3Client,
+  getUploadFileURL: () => getUploadFileURL,
+  uploadFile: () => uploadFile,
+  uploadImage: () => uploadImage
+});
+module.exports = __toCommonJS(utils_exports);
+var import_node_crypto = require("crypto");
+var import_client_s3 = require("@aws-sdk/client-s3");
+var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
+var import_functions = require("@vercel/functions");
+var getS3Client = (options) => new import_client_s3.S3Client({
+  region: options.region,
+  credentials: {
+    accessKeyId: options.awsKey,
+    secretAccessKey: options.awsSecret
+  }
+});
+var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+function getHash(keys) {
+  return (0, import_node_crypto.createHash)("sha256").update(keys.join("/")).digest("hex");
+}
+var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+  const command = new import_client_s3.PutObjectCommand({
+    Bucket,
+    Key: getHash(keys),
+    ACL: isPublic ? "public-read" : void 0
+  });
+  return (0, import_s3_request_presigner.getSignedUrl)(client, command, { expiresIn: 300 });
+};
+var getFileURL = (options) => (keys) => {
+  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
+  return `${getURLPrefix(options)}${getHash(keys)}`;
+};
+var uploadImage = (client, options) => async (url, key, blob) => {
+  const photoBlob = blob || await fetch(url).then((file) => file.blob());
+  if (photoBlob) {
+    (0, import_functions.waitUntil)(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
+    return getFileURL(options)(key);
+  }
+  return null;
+};
+var deleteImage = (client, options) => async (url) => {
+  const key = url.split(getURLPrefix(options))[1];
+  if (key) {
+    try {
+      await client.send(
+        new import_client_s3.DeleteObjectCommand({
+          Bucket: options.bucket,
+          Key: key
+        })
+      );
+      return true;
+    } catch (e) {
+      console.error("ERROR", url, e);
+    }
+  }
+  return false;
+};
+var uploadFile = (client, Bucket) => async (file, key) => {
+  const fileBuffer = await file.arrayBuffer();
+  return client.send(
+    new import_client_s3.PutObjectCommand({
+      Bucket,
+      Key: key,
+      ACL: "public-read",
+      Body: Buffer.from(fileBuffer),
+      ContentType: file.type,
+      ContentLength: file.size
+    })
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deleteImage,
+  getFileURL,
+  getS3Client,
+  getUploadFileURL,
+  uploadFile,
+  uploadImage
+});

package/dist/file/utils.d.mts

@@ -0,0 +1,13 @@
+import * as _aws_sdk_client_s3 from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
+import { SetupFileUploadOptions } from './setup.mjs';
+import 'next/server';
+
+declare const getS3Client: (options: SetupFileUploadOptions) => S3Client;
+declare const getUploadFileURL: (client: S3Client, Bucket: string) => (keys: string[], isPublic?: boolean) => Promise<string>;
+declare const getFileURL: (options: SetupFileUploadOptions) => (keys: string | string[]) => string;
+declare const uploadImage: (client: S3Client, options: SetupFileUploadOptions) => (url: string, key: string[], blob?: Blob) => Promise<string | null>;
+declare const deleteImage: (client: S3Client, options: SetupFileUploadOptions) => (url: string) => Promise<boolean>;
+declare const uploadFile: (client: S3Client, Bucket: string) => (file: File | Blob, key: string) => Promise<_aws_sdk_client_s3.PutObjectCommandOutput>;
+
+export { deleteImage, getFileURL, getS3Client, getUploadFileURL, uploadFile, uploadImage };

package/dist/file/utils.d.ts

@@ -0,0 +1,13 @@
+import * as _aws_sdk_client_s3 from '@aws-sdk/client-s3';
+import { S3Client } from '@aws-sdk/client-s3';
+import { SetupFileUploadOptions } from './setup.js';
+import 'next/server';
+
+declare const getS3Client: (options: SetupFileUploadOptions) => S3Client;
+declare const getUploadFileURL: (client: S3Client, Bucket: string) => (keys: string[], isPublic?: boolean) => Promise<string>;
+declare const getFileURL: (options: SetupFileUploadOptions) => (keys: string | string[]) => string;
+declare const uploadImage: (client: S3Client, options: SetupFileUploadOptions) => (url: string, key: string[], blob?: Blob) => Promise<string | null>;
+declare const deleteImage: (client: S3Client, options: SetupFileUploadOptions) => (url: string) => Promise<boolean>;
+declare const uploadFile: (client: S3Client, Bucket: string) => (file: File | Blob, key: string) => Promise<_aws_sdk_client_s3.PutObjectCommandOutput>;
+
+export { deleteImage, getFileURL, getS3Client, getUploadFileURL, uploadFile, uploadImage };

package/dist/file/utils.esm.js

@@ -0,0 +1,78 @@
+// src/file/utils.ts
+import { createHash } from "crypto";
+import {
+  DeleteObjectCommand,
+  PutObjectCommand,
+  S3Client
+} from "@aws-sdk/client-s3";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { waitUntil } from "@vercel/functions";
+var getS3Client = (options) => new S3Client({
+  region: options.region,
+  credentials: {
+    accessKeyId: options.awsKey,
+    secretAccessKey: options.awsSecret
+  }
+});
+var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+function getHash(keys) {
+  return createHash("sha256").update(keys.join("/")).digest("hex");
+}
+var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+  const command = new PutObjectCommand({
+    Bucket,
+    Key: getHash(keys),
+    ACL: isPublic ? "public-read" : void 0
+  });
+  return getSignedUrl(client, command, { expiresIn: 300 });
+};
+var getFileURL = (options) => (keys) => {
+  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
+  return `${getURLPrefix(options)}${getHash(keys)}`;
+};
+var uploadImage = (client, options) => async (url, key, blob) => {
+  const photoBlob = blob || await fetch(url).then((file) => file.blob());
+  if (photoBlob) {
+    waitUntil(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
+    return getFileURL(options)(key);
+  }
+  return null;
+};
+var deleteImage = (client, options) => async (url) => {
+  const key = url.split(getURLPrefix(options))[1];
+  if (key) {
+    try {
+      await client.send(
+        new DeleteObjectCommand({
+          Bucket: options.bucket,
+          Key: key
+        })
+      );
+      return true;
+    } catch (e) {
+      console.error("ERROR", url, e);
+    }
+  }
+  return false;
+};
+var uploadFile = (client, Bucket) => async (file, key) => {
+  const fileBuffer = await file.arrayBuffer();
+  return client.send(
+    new PutObjectCommand({
+      Bucket,
+      Key: key,
+      ACL: "public-read",
+      Body: Buffer.from(fileBuffer),
+      ContentType: file.type,
+      ContentLength: file.size
+    })
+  );
+};
+export {
+  deleteImage,
+  getFileURL,
+  getS3Client,
+  getUploadFileURL,
+  uploadFile,
+  uploadImage
+};

package/dist/graphql/utils.d.mts

@@ -8,10 +8,11 @@ type Values = object | string | number | boolean;
 type DeepPartial<T> = {
     [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
+type OtherTypes<T> = GraphQLScalarType<T, T> | [GraphQLScalarType<T, T>] | NumberConstructor | [NumberConstructor] | StringConstructor | [StringConstructor] | BooleanConstructor | [BooleanConstructor];
 interface BaseDefinition<T extends Values, U extends Values> {
-    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : GraphQLScalarType<T, T> | NumberConstructor | StringConstructor | BooleanConstructor;
+    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
     outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : GraphQLScalarType<U, U> | NumberConstructor | StringConstructor | BooleanConstructor;
+    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
     inputOptions?: ArgsOptions;
     authorized?: boolean;
 }

package/dist/graphql/utils.d.ts

@@ -8,10 +8,11 @@ type Values = object | string | number | boolean;
 type DeepPartial<T> = {
     [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
+type OtherTypes<T> = GraphQLScalarType<T, T> | [GraphQLScalarType<T, T>] | NumberConstructor | [NumberConstructor] | StringConstructor | [StringConstructor] | BooleanConstructor | [BooleanConstructor];
 interface BaseDefinition<T extends Values, U extends Values> {
-    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : GraphQLScalarType<T, T> | NumberConstructor | StringConstructor | BooleanConstructor;
+    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
     outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : GraphQLScalarType<U, U> | NumberConstructor | StringConstructor | BooleanConstructor;
+    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
     inputOptions?: ArgsOptions;
     authorized?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.1.13-beta.3",
+  "version": "1.1.13",
   "description": "A stack built with tight Next + Drizzle + GraphQL",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -32,6 +32,11 @@
       "types": "./dist/client/index.d.ts",
       "import": "./dist/client/index.esm.js",
       "require": "./dist/client/index.cjs.js"
+    },
+    "./file": {
+      "types": "./dist/file/index.d.ts",
+      "import": "./dist/file/index.esm.js",
+      "require": "./dist/file/index.cjs.js"
     }
   },
   "keywords": [
@@ -56,6 +61,8 @@
   "dependencies": {
     "@apollo/server": "^4.12.0",
     "@as-integrations/next": "^3.2.0",
+    "@aws-sdk/client-s3": "^3.913.0",
+    "@aws-sdk/s3-request-presigner": "^3.913.0",
     "@vercel/functions": "^3.1.0",
     "bcryptjs": "^3.0.2",
     "drizzle-orm": "^0.44.5",