r2-explorer 1.1.1 → 1.1.3

package/dist/index.js

@@ -33,7 +33,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_cloudflare_access = require("@hono/cloudflare-access");
-var import_chanfana15 = require("chanfana");
+var import_chanfana14 = require("chanfana");
 var import_hono = require("hono");
 var import_basic_auth = require("hono/basic-auth");
 var import_cors = require("hono/cors");
@@ -60,7 +60,7 @@ async function readOnlyMiddleware(c, next) {
 }
 
 // package.json
-var version = "1.1.1";
+var version = "1.1.3";
 
 // src/foundation/settings.ts
 var settings = {
@@ -213,31 +213,10 @@ var HeadObject = class extends import_chanfana4.OpenAPIRoute {
   }
 };
 
-// src/modules/buckets/listBuckets.ts
-var import_chanfana5 = require("chanfana");
-var ListBuckets = class extends import_chanfana5.OpenAPIRoute {
-  schema = {
-    operationId: "get-bucket-list",
-    tags: ["Buckets"],
-    summary: "List buckets"
-  };
-  async handle(c) {
-    const buckets = [];
-    for (const [key, value] of Object.entries(c.env)) {
-      if (value.get && value.put && value.get.toString().includes("function") && value.put.toString().includes("function")) {
-        buckets.push({ name: key });
-      }
-    }
-    return {
-      buckets
-    };
-  }
-};
-
 // src/modules/buckets/listObjects.ts
-var import_chanfana6 = require("chanfana");
+var import_chanfana5 = require("chanfana");
 var import_zod5 = require("zod");
-var ListObjects = class extends import_chanfana6.OpenAPIRoute {
+var ListObjects = class extends import_chanfana5.OpenAPIRoute {
   schema = {
     operationId: "get-bucket-list-objects",
     tags: ["Buckets"],
@@ -273,9 +252,9 @@ var ListObjects = class extends import_chanfana6.OpenAPIRoute {
 };
 
 // src/modules/buckets/moveObject.ts
-var import_chanfana7 = require("chanfana");
+var import_chanfana6 = require("chanfana");
 var import_zod6 = require("zod");
-var MoveObject = class extends import_chanfana7.OpenAPIRoute {
+var MoveObject = class extends import_chanfana6.OpenAPIRoute {
   schema = {
     operationId: "post-bucket-move-object",
     tags: ["Buckets"],
@@ -312,9 +291,9 @@ var MoveObject = class extends import_chanfana7.OpenAPIRoute {
 };
 
 // src/modules/buckets/multipart/completeUpload.ts
-var import_chanfana8 = require("chanfana");
+var import_chanfana7 = require("chanfana");
 var import_zod7 = require("zod");
-var CompleteUpload = class extends import_chanfana8.OpenAPIRoute {
+var CompleteUpload = class extends import_chanfana7.OpenAPIRoute {
   schema = {
     operationId: "post-multipart-complete-upload",
     tags: ["Multipart"],
@@ -359,9 +338,9 @@ var CompleteUpload = class extends import_chanfana8.OpenAPIRoute {
 };
 
 // src/modules/buckets/multipart/createUpload.ts
-var import_chanfana9 = require("chanfana");
+var import_chanfana8 = require("chanfana");
 var import_zod8 = require("zod");
-var CreateUpload = class extends import_chanfana9.OpenAPIRoute {
+var CreateUpload = class extends import_chanfana8.OpenAPIRoute {
   schema = {
     operationId: "post-multipart-create-upload",
     tags: ["Multipart"],
@@ -401,9 +380,9 @@ var CreateUpload = class extends import_chanfana9.OpenAPIRoute {
 };
 
 // src/modules/buckets/multipart/partUpload.ts
-var import_chanfana10 = require("chanfana");
+var import_chanfana9 = require("chanfana");
 var import_zod9 = require("zod");
-var PartUpload = class extends import_chanfana10.OpenAPIRoute {
+var PartUpload = class extends import_chanfana9.OpenAPIRoute {
   schema = {
     operationId: "post-multipart-part-upload",
     tags: ["Multipart"],
@@ -449,9 +428,9 @@ var PartUpload = class extends import_chanfana10.OpenAPIRoute {
 };
 
 // src/modules/buckets/putMetadata.ts
-var import_chanfana11 = require("chanfana");
+var import_chanfana10 = require("chanfana");
 var import_zod10 = require("zod");
-var PutMetadata = class extends import_chanfana11.OpenAPIRoute {
+var PutMetadata = class extends import_chanfana10.OpenAPIRoute {
   schema = {
     operationId: "post-bucket-put-object-metadata",
     tags: ["Buckets"],
@@ -493,9 +472,9 @@ var PutMetadata = class extends import_chanfana11.OpenAPIRoute {
 };
 
 // src/modules/buckets/putObject.ts
-var import_chanfana12 = require("chanfana");
+var import_chanfana11 = require("chanfana");
 var import_zod11 = require("zod");
-var PutObject = class extends import_chanfana12.OpenAPIRoute {
+var PutObject = class extends import_chanfana11.OpenAPIRoute {
   schema = {
     operationId: "post-bucket-upload-object",
     tags: ["Buckets"],
@@ -636,9 +615,9 @@ async function receiveEmail(event, env, ctx, config) {
 }
 
 // src/modules/emails/sendEmail.ts
-var import_chanfana13 = require("chanfana");
+var import_chanfana12 = require("chanfana");
 var import_zod12 = require("zod");
-var SendEmail = class extends import_chanfana13.OpenAPIRoute {
+var SendEmail = class extends import_chanfana12.OpenAPIRoute {
   schema = {
     operationId: "post-email-send",
     tags: ["Emails"],
@@ -648,14 +627,14 @@ var SendEmail = class extends import_chanfana13.OpenAPIRoute {
         content: {
           "application/json": {
             schema: import_zod12.z.object({
-              subject: (0, import_chanfana13.Str)({ example: "Look! No servers" }),
+              subject: (0, import_chanfana12.Str)({ example: "Look! No servers" }),
               from: import_zod12.z.object({
-                email: (0, import_chanfana13.Str)({ example: "sender@example.com" }),
-                name: (0, import_chanfana13.Str)({ example: "Workers - MailChannels integration" })
+                email: (0, import_chanfana12.Str)({ example: "sender@example.com" }),
+                name: (0, import_chanfana12.Str)({ example: "Workers - MailChannels integration" })
               }),
               to: import_zod12.z.object({
-                email: (0, import_chanfana13.Str)({ example: "test@example.com" }),
-                name: (0, import_chanfana13.Str)({ example: "Test Recipient" })
+                email: (0, import_chanfana12.Str)({ example: "test@example.com" }),
+                name: (0, import_chanfana12.Str)({ example: "Test Recipient" })
               }).array(),
               content: import_zod12.z.object({}).catchall(import_zod12.z.string())
             })
@@ -675,8 +654,8 @@ var SendEmail = class extends import_chanfana13.OpenAPIRoute {
 };
 
 // src/modules/server/getInfo.ts
-var import_chanfana14 = require("chanfana");
-var GetInfo = class extends import_chanfana14.OpenAPIRoute {
+var import_chanfana13 = require("chanfana");
+var GetInfo = class extends import_chanfana13.OpenAPIRoute {
   schema = {
     operationId: "get-server-info",
     tags: ["Server"],
@@ -684,20 +663,27 @@ var GetInfo = class extends import_chanfana14.OpenAPIRoute {
   };
   async handle(c) {
     const { basicAuth: basicAuth2, ...config } = c.get("config");
+    const buckets = [];
+    for (const [key, value] of Object.entries(c.env)) {
+      if (value.get && value.put && value.get.toString().includes("function") && value.put.toString().includes("function")) {
+        buckets.push({ name: key });
+      }
+    }
     return {
       version: settings.version,
       config,
       auth: c.get("authentication_type") ? {
         type: c.get("authentication_type"),
         username: c.get("authentication_username")
-      } : void 0
+      } : void 0,
+      buckets
     };
   }
 };
 
 // src/index.ts
 function R2Explorer(config) {
-  (0, import_chanfana15.extendZodWithOpenApi)(import_zod13.z);
+  (0, import_chanfana14.extendZodWithOpenApi)(import_zod13.z);
   config = config || {};
   if (config.readonly !== false) config.readonly = true;
   const openapiSchema = {
@@ -719,27 +705,20 @@ function R2Explorer(config) {
     c.set("config", config);
     await next();
   });
-  const openapi = (0, import_chanfana15.fromHono)(app, {
+  const openapi = (0, import_chanfana14.fromHono)(app, {
     schema: openapiSchema,
     raiseUnknownParameters: true,
     generateOperationIds: false
   });
   if (config.cors === true) {
-    app.use(
-      "*",
-      (0, import_cors.cors)({
-        origin: "*",
-        allowMethods: ["*"],
-        credentials: true
-      })
-    );
+    app.use("/api/*", (0, import_cors.cors)());
   }
   if (config.readonly === true) {
-    app.use("*", readOnlyMiddleware);
+    app.use("/api/*", readOnlyMiddleware);
   }
   if (config.cfAccessTeamName) {
-    app.use("*", (0, import_cloudflare_access.cloudflareAccess)(config.cfAccessTeamName));
-    app.use("*", async (c, next) => {
+    app.use("/api/*", (0, import_cloudflare_access.cloudflareAccess)(config.cfAccessTeamName));
+    app.use("/api/*", async (c, next) => {
       c.set("authentication_type", "cloudflare-access");
       c.set("authentication_username", c.get("accessPayload").email);
       await next();
@@ -751,8 +730,9 @@ function R2Explorer(config) {
       scheme: "basic"
     });
     app.use(
-      "*",
+      "/api/*",
       (0, import_basic_auth.basicAuth)({
+        invalidUserMessage: "Authentication error: Basic Auth required",
         verifyUser: (username, password, c) => {
           const users = Array.isArray(c.get("config").basicAuth) ? c.get("config").basicAuth : [c.get("config").basicAuth];
           for (const user of users) {
@@ -768,7 +748,6 @@ function R2Explorer(config) {
     );
   }
   openapi.get("/api/server/config", GetInfo);
-  openapi.get("/api/buckets", ListBuckets);
   openapi.get("/api/buckets/:bucket", ListObjects);
   openapi.post("/api/buckets/:bucket/move", MoveObject);
   openapi.post("/api/buckets/:bucket/folder", CreateFolder);

package/dist/index.mjs

@@ -30,7 +30,7 @@ async function readOnlyMiddleware(c, next) {
 }
 
 // package.json
-var version = "1.1.1";
+var version = "1.1.3";
 
 // src/foundation/settings.ts
 var settings = {
@@ -183,31 +183,10 @@ var HeadObject = class extends OpenAPIRoute4 {
   }
 };
 
-// src/modules/buckets/listBuckets.ts
-import { OpenAPIRoute as OpenAPIRoute5 } from "chanfana";
-var ListBuckets = class extends OpenAPIRoute5 {
-  schema = {
-    operationId: "get-bucket-list",
-    tags: ["Buckets"],
-    summary: "List buckets"
-  };
-  async handle(c) {
-    const buckets = [];
-    for (const [key, value] of Object.entries(c.env)) {
-      if (value.get && value.put && value.get.toString().includes("function") && value.put.toString().includes("function")) {
-        buckets.push({ name: key });
-      }
-    }
-    return {
-      buckets
-    };
-  }
-};
-
 // src/modules/buckets/listObjects.ts
-import { OpenAPIRoute as OpenAPIRoute6 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute5 } from "chanfana";
 import { z as z5 } from "zod";
-var ListObjects = class extends OpenAPIRoute6 {
+var ListObjects = class extends OpenAPIRoute5 {
   schema = {
     operationId: "get-bucket-list-objects",
     tags: ["Buckets"],
@@ -243,9 +222,9 @@ var ListObjects = class extends OpenAPIRoute6 {
 };
 
 // src/modules/buckets/moveObject.ts
-import { OpenAPIRoute as OpenAPIRoute7 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute6 } from "chanfana";
 import { z as z6 } from "zod";
-var MoveObject = class extends OpenAPIRoute7 {
+var MoveObject = class extends OpenAPIRoute6 {
   schema = {
     operationId: "post-bucket-move-object",
     tags: ["Buckets"],
@@ -282,9 +261,9 @@ var MoveObject = class extends OpenAPIRoute7 {
 };
 
 // src/modules/buckets/multipart/completeUpload.ts
-import { OpenAPIRoute as OpenAPIRoute8 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute7 } from "chanfana";
 import { z as z7 } from "zod";
-var CompleteUpload = class extends OpenAPIRoute8 {
+var CompleteUpload = class extends OpenAPIRoute7 {
   schema = {
     operationId: "post-multipart-complete-upload",
     tags: ["Multipart"],
@@ -329,9 +308,9 @@ var CompleteUpload = class extends OpenAPIRoute8 {
 };
 
 // src/modules/buckets/multipart/createUpload.ts
-import { OpenAPIRoute as OpenAPIRoute9 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute8 } from "chanfana";
 import { z as z8 } from "zod";
-var CreateUpload = class extends OpenAPIRoute9 {
+var CreateUpload = class extends OpenAPIRoute8 {
   schema = {
     operationId: "post-multipart-create-upload",
     tags: ["Multipart"],
@@ -371,9 +350,9 @@ var CreateUpload = class extends OpenAPIRoute9 {
 };
 
 // src/modules/buckets/multipart/partUpload.ts
-import { OpenAPIRoute as OpenAPIRoute10 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute9 } from "chanfana";
 import { z as z9 } from "zod";
-var PartUpload = class extends OpenAPIRoute10 {
+var PartUpload = class extends OpenAPIRoute9 {
   schema = {
     operationId: "post-multipart-part-upload",
     tags: ["Multipart"],
@@ -419,9 +398,9 @@ var PartUpload = class extends OpenAPIRoute10 {
 };
 
 // src/modules/buckets/putMetadata.ts
-import { OpenAPIRoute as OpenAPIRoute11 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute10 } from "chanfana";
 import { z as z10 } from "zod";
-var PutMetadata = class extends OpenAPIRoute11 {
+var PutMetadata = class extends OpenAPIRoute10 {
   schema = {
     operationId: "post-bucket-put-object-metadata",
     tags: ["Buckets"],
@@ -463,9 +442,9 @@ var PutMetadata = class extends OpenAPIRoute11 {
 };
 
 // src/modules/buckets/putObject.ts
-import { OpenAPIRoute as OpenAPIRoute12 } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute11 } from "chanfana";
 import { z as z11 } from "zod";
-var PutObject = class extends OpenAPIRoute12 {
+var PutObject = class extends OpenAPIRoute11 {
   schema = {
     operationId: "post-bucket-upload-object",
     tags: ["Buckets"],
@@ -606,9 +585,9 @@ async function receiveEmail(event, env, ctx, config) {
 }
 
 // src/modules/emails/sendEmail.ts
-import { OpenAPIRoute as OpenAPIRoute13, Str } from "chanfana";
+import { OpenAPIRoute as OpenAPIRoute12, Str } from "chanfana";
 import { z as z12 } from "zod";
-var SendEmail = class extends OpenAPIRoute13 {
+var SendEmail = class extends OpenAPIRoute12 {
   schema = {
     operationId: "post-email-send",
     tags: ["Emails"],
@@ -645,8 +624,8 @@ var SendEmail = class extends OpenAPIRoute13 {
 };
 
 // src/modules/server/getInfo.ts
-import { OpenAPIRoute as OpenAPIRoute14 } from "chanfana";
-var GetInfo = class extends OpenAPIRoute14 {
+import { OpenAPIRoute as OpenAPIRoute13 } from "chanfana";
+var GetInfo = class extends OpenAPIRoute13 {
   schema = {
     operationId: "get-server-info",
     tags: ["Server"],
@@ -654,13 +633,20 @@ var GetInfo = class extends OpenAPIRoute14 {
   };
   async handle(c) {
     const { basicAuth: basicAuth2, ...config } = c.get("config");
+    const buckets = [];
+    for (const [key, value] of Object.entries(c.env)) {
+      if (value.get && value.put && value.get.toString().includes("function") && value.put.toString().includes("function")) {
+        buckets.push({ name: key });
+      }
+    }
     return {
       version: settings.version,
       config,
       auth: c.get("authentication_type") ? {
         type: c.get("authentication_type"),
         username: c.get("authentication_username")
-      } : void 0
+      } : void 0,
+      buckets
     };
   }
 };
@@ -695,21 +681,14 @@ function R2Explorer(config) {
     generateOperationIds: false
   });
   if (config.cors === true) {
-    app.use(
-      "*",
-      cors({
-        origin: "*",
-        allowMethods: ["*"],
-        credentials: true
-      })
-    );
+    app.use("/api/*", cors());
   }
   if (config.readonly === true) {
-    app.use("*", readOnlyMiddleware);
+    app.use("/api/*", readOnlyMiddleware);
   }
   if (config.cfAccessTeamName) {
-    app.use("*", cloudflareAccess(config.cfAccessTeamName));
-    app.use("*", async (c, next) => {
+    app.use("/api/*", cloudflareAccess(config.cfAccessTeamName));
+    app.use("/api/*", async (c, next) => {
       c.set("authentication_type", "cloudflare-access");
       c.set("authentication_username", c.get("accessPayload").email);
       await next();
@@ -721,8 +700,9 @@ function R2Explorer(config) {
       scheme: "basic"
     });
     app.use(
-      "*",
+      "/api/*",
       basicAuth({
+        invalidUserMessage: "Authentication error: Basic Auth required",
         verifyUser: (username, password, c) => {
           const users = Array.isArray(c.get("config").basicAuth) ? c.get("config").basicAuth : [c.get("config").basicAuth];
           for (const user of users) {
@@ -738,7 +718,6 @@ function R2Explorer(config) {
     );
   }
   openapi.get("/api/server/config", GetInfo);
-  openapi.get("/api/buckets", ListBuckets);
   openapi.get("/api/buckets/:bucket", ListObjects);
   openapi.post("/api/buckets/:bucket/move", MoveObject);
   openapi.post("/api/buckets/:bucket/folder", CreateFolder);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "r2-explorer",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"description": "A Google Drive Interface for your Cloudflare R2 Buckets",
 	"main": "./dist/index.js",
 	"module": "./dist/index.mjs",
@@ -16,7 +16,7 @@
 		"lint": "npx @biomejs/biome check src/ tests/ || (npx @biomejs/biome check --write src/ tests/; exit 1)",
 		"test": "vitest run --root tests",
 		"package": "npm run build && npm pack",
-    "publish": "npm publish"
+		"publish-npm": "npm publish"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -46,7 +46,7 @@
 	"homepage": "https://r2explorer.dev",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/G4brym/R2-Explorer.git"
+		"url": "git+https://github.com/G4brym/R2-Explorer.git"
 	},
 	"bugs": {
 		"url": "https://github.com/G4brym/R2-Explorer/issues"
@@ -59,9 +59,9 @@
 		"wrangler": "^3.91.0"
 	},
 	"dependencies": {
-		"@hono/cloudflare-access": "^0.1.0",
+		"@hono/cloudflare-access": "^0.2.0",
 		"chanfana": "^2.5.1",
-		"hono": "^4.6.14",
+		"hono": "^4.6.15",
 		"postal-mime": "^2.3.2",
 		"zod": "^3.24.1"
 	}

package/dashboard/assets/auth-store.748ba7e9.js

@@ -1 +0,0 @@
-import{d as c,u as i,a as s}from"./index.b2fb13c9.js";const o="r2_explorer_session_token",h=c("auth",{state:()=>({user:"",loginMethod:""}),getters:{isAuthenticated:e=>!!e.user,StateUser:e=>e.user},actions:{async LogIn(e,t){var n;const r=i(),a=btoa(`${t.username}:${t.password}`);s.defaults.headers.common.Authorization=`Basic ${a}`;try{await r.loadServerConfigs(e)}catch(l){throw console.log(l),delete s.defaults.headers.common.Authorization,new Error("Invalid username or password")}s.defaults.headers.common.Authorization=`Basic ${a}`,this.loginMethod="basic",this.user=t.email,t.remind===!0?localStorage.setItem(o,a):sessionStorage.setItem(o,a),e.replace(((n=e.currentRoute.value.query)==null?void 0:n.next)||"/")},async CheckLoginInStorage(e){let t=sessionStorage.getItem(o);if(t||(t=localStorage.getItem(o)),!t)return!1;const r=i();s.defaults.headers.common.Authorization=`Basic ${t}`;try{await r.loadServerConfigs(e)}catch{delete s.defaults.headers.common.Authorization,await e.replace({name:"login",query:{next:e.currentRoute.fullPath}});return}this.user=atob(t).split(":")[0],this.loginMethod="basic"},async LogOut(e){localStorage.removeItem(o),sessionStorage.removeItem(o),this.user="",this.loginMethod="",await e.replace({name:"login"})}}});export{h as u};

package/dashboard/assets/auth.221c63c3.js

@@ -1 +0,0 @@
-import{b as o,u as e}from"./index.b2fb13c9.js";import{u as r}from"./auth-store.748ba7e9.js";var h=o(async({router:a,store:t})=>{await r(t).CheckLoginInStorage(a)===!1&&await e(t).loadServerConfigs(a,!0)});export{h as default};

package/dashboard/spa/assets/auth-store.748ba7e9.js

@@ -1 +0,0 @@
-import{d as c,u as i,a as s}from"./index.b2fb13c9.js";const o="r2_explorer_session_token",h=c("auth",{state:()=>({user:"",loginMethod:""}),getters:{isAuthenticated:e=>!!e.user,StateUser:e=>e.user},actions:{async LogIn(e,t){var n;const r=i(),a=btoa(`${t.username}:${t.password}`);s.defaults.headers.common.Authorization=`Basic ${a}`;try{await r.loadServerConfigs(e)}catch(l){throw console.log(l),delete s.defaults.headers.common.Authorization,new Error("Invalid username or password")}s.defaults.headers.common.Authorization=`Basic ${a}`,this.loginMethod="basic",this.user=t.email,t.remind===!0?localStorage.setItem(o,a):sessionStorage.setItem(o,a),e.replace(((n=e.currentRoute.value.query)==null?void 0:n.next)||"/")},async CheckLoginInStorage(e){let t=sessionStorage.getItem(o);if(t||(t=localStorage.getItem(o)),!t)return!1;const r=i();s.defaults.headers.common.Authorization=`Basic ${t}`;try{await r.loadServerConfigs(e)}catch{delete s.defaults.headers.common.Authorization,await e.replace({name:"login",query:{next:e.currentRoute.fullPath}});return}this.user=atob(t).split(":")[0],this.loginMethod="basic"},async LogOut(e){localStorage.removeItem(o),sessionStorage.removeItem(o),this.user="",this.loginMethod="",await e.replace({name:"login"})}}});export{h as u};

package/dashboard/spa/assets/auth.221c63c3.js

@@ -1 +0,0 @@
-import{b as o,u as e}from"./index.b2fb13c9.js";import{u as r}from"./auth-store.748ba7e9.js";var h=o(async({router:a,store:t})=>{await r(t).CheckLoginInStorage(a)===!1&&await e(t).loadServerConfigs(a,!0)});export{h as default};