naystack 1.4.16 → 1.4.20

package/dist/file/index.esm.js

@@ -12,6 +12,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -33,17 +40,20 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, keys.signing);
+    const res = verify2(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -62,29 +72,31 @@ import {
   S3Client
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-var getS3Client = (options) => new S3Client({
-  region: options.region,
+var getS3Client = () => new S3Client({
+  region: getEnv("AWS_REGION" /* AWS_REGION */),
   credentials: {
-    accessKeyId: options.awsKey,
-    secretAccessKey: options.awsSecret
+    accessKeyId: getEnv("AWS_ACCESS_KEY_ID" /* AWS_ACCESS_KEY_ID */),
+    secretAccessKey: getEnv("AWS_ACCESS_KEY_SECRET" /* AWS_ACCESS_KEY_SECRET */)
   }
 });
-var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+var URL_PREFIX = `https://${getEnv("AWS_BUCKET" /* AWS_BUCKET */)}.s3.${getEnv(
+  "AWS_REGION" /* AWS_REGION */
+)}.amazonaws.com/`;
 function getKey(keys) {
   return typeof keys === "string" ? keys : keys.join("/");
 }
-var getUploadURL = (client, Bucket) => (keys) => {
+var getUploadURL = (client) => (keys) => {
   const command = new PutObjectCommand({
-    Bucket,
+    Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
     Key: getKey(keys),
     ACL: "public-read"
   });
   return getSignedUrl(client, command, { expiresIn: 300 });
 };
-var getDownloadURL = (options) => (keys) => {
-  return `${getURLPrefix(options)}${getKey(keys)}`;
+var getDownloadURL = (keys) => {
+  return `${URL_PREFIX}${getKey(keys)}`;
 };
-var uploadFile = (client, options) => async (keys, {
+var uploadFile = (client) => async (keys, {
   url,
   blob
 }) => {
@@ -92,18 +104,18 @@ var uploadFile = (client, options) => async (keys, {
   const fileBlob = blob || await fetch(url).then((file) => file.blob());
   if (fileBlob) {
     const key = getKey(keys);
-    await uploadBlob(client, options.bucket)(fileBlob, key);
-    return getDownloadURL(options)(key);
+    await uploadBlob(client)(fileBlob, key);
+    return getDownloadURL(key);
   }
   return null;
 };
-var deleteFile = (client, options) => async (url) => {
-  const key = url.split(getURLPrefix(options))[1];
+var deleteFile = (client) => async (url) => {
+  const key = url.split(URL_PREFIX)[1];
   if (key) {
     try {
       await client.send(
         new DeleteObjectCommand({
-          Bucket: options.bucket,
+          Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
           Key: key
         })
       );
@@ -114,11 +126,11 @@ var deleteFile = (client, options) => async (url) => {
   }
   return false;
 };
-var uploadBlob = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new PutObjectCommand({
-      Bucket,
+      Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
       Key: key,
       ACL: "public-read",
       Body: Buffer.from(fileBuffer),
@@ -130,7 +142,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.keys, req);
+  const ctx = getContext(req);
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
@@ -143,8 +155,8 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
     data: typeof data === "string" ? JSON.parse(data) : void 0
   };
   const fileKey = options.getKey ? await options.getKey(inputData) : v4();
-  const url = getDownloadURL(options)(fileKey);
-  await uploadBlob(client, options.bucket)(file, fileKey);
+  const url = getDownloadURL(fileKey);
+  await uploadBlob(client)(file, fileKey);
   const onUploadResponse = await options.onUpload({
     ...inputData,
     url
@@ -157,13 +169,13 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
 
 // src/file/setup.ts
 function setupFileUpload(options) {
-  const client = getS3Client(options);
+  const client = getS3Client();
   return {
     PUT: getFileUploadPutRoute(options, client),
-    uploadFile: uploadFile(client, options),
-    deleteFile: deleteFile(client, options),
-    getUploadURL: getUploadURL(client, options.bucket),
-    getDownloadURL: getDownloadURL(options)
+    uploadFile: uploadFile(client),
+    deleteFile: deleteFile(client),
+    getUploadURL: getUploadURL(client),
+    getDownloadURL
   };
 }
 export {

package/dist/file/put.cjs.js

@@ -36,6 +36,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -57,17 +64,20 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
+    const res = (0, import_jsonwebtoken2.verify)(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -82,18 +92,20 @@ var getContext = (keys, req) => {
 // src/file/utils.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
 var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
-var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+var URL_PREFIX = `https://${getEnv("AWS_BUCKET" /* AWS_BUCKET */)}.s3.${getEnv(
+  "AWS_REGION" /* AWS_REGION */
+)}.amazonaws.com/`;
 function getKey(keys) {
   return typeof keys === "string" ? keys : keys.join("/");
 }
-var getDownloadURL = (options) => (keys) => {
-  return `${getURLPrefix(options)}${getKey(keys)}`;
+var getDownloadURL = (keys) => {
+  return `${URL_PREFIX}${getKey(keys)}`;
 };
-var uploadBlob = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new import_client_s3.PutObjectCommand({
-      Bucket,
+      Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
       Key: key,
       ACL: "public-read",
       Body: Buffer.from(fileBuffer),
@@ -105,7 +117,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.keys, req);
+  const ctx = getContext(req);
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
@@ -118,8 +130,8 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
     data: typeof data === "string" ? JSON.parse(data) : void 0
   };
   const fileKey = options.getKey ? await options.getKey(inputData) : (0, import_uuid.v4)();
-  const url = getDownloadURL(options)(fileKey);
-  await uploadBlob(client, options.bucket)(file, fileKey);
+  const url = getDownloadURL(fileKey);
+  await uploadBlob(client)(file, fileKey);
   const onUploadResponse = await options.onUpload({
     ...inputData,
     url

package/dist/file/put.d.mts

@@ -1,8 +1,6 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { NextRequest, NextResponse } from 'next/server';
 import { SetupFileUploadOptions } from './setup.mjs';
-import '../auth/email/types.mjs';
-import '../auth/types.mjs';
 
 declare const getFileUploadPutRoute: (options: SetupFileUploadOptions, client: S3Client) => (req: NextRequest) => Promise<NextResponse<{
     error: string;

package/dist/file/put.d.ts

@@ -1,8 +1,6 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { NextRequest, NextResponse } from 'next/server';
 import { SetupFileUploadOptions } from './setup.js';
-import '../auth/email/types.js';
-import '../auth/types.js';
 
 declare const getFileUploadPutRoute: (options: SetupFileUploadOptions, client: S3Client) => (req: NextRequest) => Promise<NextResponse<{
     error: string;

package/dist/file/put.esm.js

@@ -12,6 +12,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -33,17 +40,20 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, keys.signing);
+    const res = verify2(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -62,18 +72,20 @@ import {
   S3Client
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+var URL_PREFIX = `https://${getEnv("AWS_BUCKET" /* AWS_BUCKET */)}.s3.${getEnv(
+  "AWS_REGION" /* AWS_REGION */
+)}.amazonaws.com/`;
 function getKey(keys) {
   return typeof keys === "string" ? keys : keys.join("/");
 }
-var getDownloadURL = (options) => (keys) => {
-  return `${getURLPrefix(options)}${getKey(keys)}`;
+var getDownloadURL = (keys) => {
+  return `${URL_PREFIX}${getKey(keys)}`;
 };
-var uploadBlob = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new PutObjectCommand({
-      Bucket,
+      Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
       Key: key,
       ACL: "public-read",
       Body: Buffer.from(fileBuffer),
@@ -85,7 +97,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.keys, req);
+  const ctx = getContext(req);
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
@@ -98,8 +110,8 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
     data: typeof data === "string" ? JSON.parse(data) : void 0
   };
   const fileKey = options.getKey ? await options.getKey(inputData) : v4();
-  const url = getDownloadURL(options)(fileKey);
-  await uploadBlob(client, options.bucket)(file, fileKey);
+  const url = getDownloadURL(fileKey);
+  await uploadBlob(client)(file, fileKey);
   const onUploadResponse = await options.onUpload({
     ...inputData,
     url

package/dist/file/setup.cjs.js

@@ -38,6 +38,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -59,17 +66,20 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
+    const res = (0, import_jsonwebtoken2.verify)(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -84,29 +94,31 @@ var getContext = (keys, req) => {
 // src/file/utils.ts
 var import_client_s3 = require("@aws-sdk/client-s3");
 var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
-var getS3Client = (options) => new import_client_s3.S3Client({
-  region: options.region,
+var getS3Client = () => new import_client_s3.S3Client({
+  region: getEnv("AWS_REGION" /* AWS_REGION */),
   credentials: {
-    accessKeyId: options.awsKey,
-    secretAccessKey: options.awsSecret
+    accessKeyId: getEnv("AWS_ACCESS_KEY_ID" /* AWS_ACCESS_KEY_ID */),
+    secretAccessKey: getEnv("AWS_ACCESS_KEY_SECRET" /* AWS_ACCESS_KEY_SECRET */)
   }
 });
-var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
+var URL_PREFIX = `https://${getEnv("AWS_BUCKET" /* AWS_BUCKET */)}.s3.${getEnv(
+  "AWS_REGION" /* AWS_REGION */
+)}.amazonaws.com/`;
 function getKey(keys) {
   return typeof keys === "string" ? keys : keys.join("/");
 }
-var getUploadURL = (client, Bucket) => (keys) => {
+var getUploadURL = (client) => (keys) => {
   const command = new import_client_s3.PutObjectCommand({
-    Bucket,
+    Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
     Key: getKey(keys),
     ACL: "public-read"
   });
   return (0, import_s3_request_presigner.getSignedUrl)(client, command, { expiresIn: 300 });
 };
-var getDownloadURL = (options) => (keys) => {
-  return `${getURLPrefix(options)}${getKey(keys)}`;
+var getDownloadURL = (keys) => {
+  return `${URL_PREFIX}${getKey(keys)}`;
 };
-var uploadFile = (client, options) => async (keys, {
+var uploadFile = (client) => async (keys, {
   url,
   blob
 }) => {
@@ -114,18 +126,18 @@ var uploadFile = (client, options) => async (keys, {
   const fileBlob = blob || await fetch(url).then((file) => file.blob());
   if (fileBlob) {
     const key = getKey(keys);
-    await uploadBlob(client, options.bucket)(fileBlob, key);
-    return getDownloadURL(options)(key);
+    await uploadBlob(client)(fileBlob, key);
+    return getDownloadURL(key);
   }
   return null;
 };
-var deleteFile = (client, options) => async (url) => {
-  const key = url.split(getURLPrefix(options))[1];
+var deleteFile = (client) => async (url) => {
+  const key = url.split(URL_PREFIX)[1];
   if (key) {
     try {
       await client.send(
         new import_client_s3.DeleteObjectCommand({
-          Bucket: options.bucket,
+          Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
           Key: key
         })
       );
@@ -136,11 +148,11 @@ var deleteFile = (client, options) => async (url) => {
   }
   return false;
 };
-var uploadBlob = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new import_client_s3.PutObjectCommand({
-      Bucket,
+      Bucket: getEnv("AWS_BUCKET" /* AWS_BUCKET */),
       Key: key,
       ACL: "public-read",
       Body: Buffer.from(fileBuffer),
@@ -152,7 +164,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.keys, req);
+  const ctx = getContext(req);
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
@@ -165,8 +177,8 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
     data: typeof data === "string" ? JSON.parse(data) : void 0
   };
   const fileKey = options.getKey ? await options.getKey(inputData) : (0, import_uuid.v4)();
-  const url = getDownloadURL(options)(fileKey);
-  await uploadBlob(client, options.bucket)(file, fileKey);
+  const url = getDownloadURL(fileKey);
+  await uploadBlob(client)(file, fileKey);
   const onUploadResponse = await options.onUpload({
     ...inputData,
     url
@@ -179,13 +191,13 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
 
 // src/file/setup.ts
 function setupFileUpload(options) {
-  const client = getS3Client(options);
+  const client = getS3Client();
   return {
     PUT: getFileUploadPutRoute(options, client),
-    uploadFile: uploadFile(client, options),
-    deleteFile: deleteFile(client, options),
-    getUploadURL: getUploadURL(client, options.bucket),
-    getDownloadURL: getDownloadURL(options)
+    uploadFile: uploadFile(client),
+    deleteFile: deleteFile(client),
+    getUploadURL: getUploadURL(client),
+    getDownloadURL
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/file/setup.d.mts

@@ -1,13 +1,6 @@
 import * as next_server from 'next/server';
-import { AuthKeys } from '../auth/email/types.mjs';
-import '../auth/types.mjs';
 
 interface SetupFileUploadOptions {
-    keys: AuthKeys;
-    region: string;
-    bucket: string;
-    awsSecret: string;
-    awsKey: string;
     getKey?: (data: {
         type: string;
         userId: number;

package/dist/file/setup.d.ts

@@ -1,13 +1,6 @@
 import * as next_server from 'next/server';
-import { AuthKeys } from '../auth/email/types.js';
-import '../auth/types.js';
 
 interface SetupFileUploadOptions {
-    keys: AuthKeys;
-    region: string;
-    bucket: string;
-    awsSecret: string;
-    awsKey: string;
     getKey?: (data: {
         type: string;
         userId: number;