kap-r2 1.0.1 → 1.0.3

package/dist/index.js

@@ -1,8 +1,14 @@
-import { createReadStream } from "node:fs";
-import { stat } from "node:fs/promises";
-import path from "node:path";
-import { S3Client } from "@aws-sdk/client-s3";
-import { Upload } from "@aws-sdk/lib-storage";
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shareServices = void 0;
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
+const node_https_1 = __importDefault(require("node:https"));
+const aws4_1 = __importDefault(require("aws4"));
 const contentTypes = new Map([
     [".gif", "image/gif"],
     [".mp4", "video/mp4"],
@@ -38,42 +44,57 @@ const action = async (context) => {
         return;
     }
     const filePath = await context.filePath();
-    const fileStats = await stat(filePath);
+    const fileStats = await (0, promises_1.stat)(filePath);
+    const fileBuffer = await (0, promises_1.readFile)(filePath);
     context.setProgress("Uploading to R2…", 0);
-    const client = new S3Client({
-        region: "auto",
-        endpoint: `https://${accountId}.r2.cloudflarestorage.com`,
-        credentials: {
-            accessKeyId,
-            secretAccessKey,
+    const filename = node_path_1.default.basename(filePath);
+    const key = directory ? node_path_1.default.posix.join(directory, filename) : filename;
+    const extension = node_path_1.default.extname(filename);
+    const contentType = contentTypes.get(extension) || "application/octet-stream";
+    const host = `${bucket}.${accountId}.r2.cloudflarestorage.com`;
+    const encodedKey = key.split("/").map(encodeURIComponent).join("/");
+    const request = aws4_1.default.sign({
+        host,
+        path: `/${encodedKey}`,
+        method: "PUT",
+        headers: {
+            "Content-Type": contentType,
+            "Content-Length": fileStats.size,
         },
+        body: fileBuffer,
+        service: "s3",
+        region: "auto",
+    }, {
+        accessKeyId,
+        secretAccessKey,
     });
-    const filename = path.basename(filePath);
-    const key = directory ? path.posix.join(directory, filename) : filename;
-    const extension = path.extname(filename);
-    const contentType = contentTypes.get(extension) || "application/octet-stream";
     try {
-        const upload = new Upload({
-            client,
-            params: {
-                Bucket: bucket,
-                Key: key,
-                Body: createReadStream(filePath),
-                ContentType: contentType,
-            },
-            queueSize: 4,
-            partSize: 1024 * 1024 * 5,
-            leavePartsOnError: false,
-        });
-        upload.on("httpUploadProgress", (progress) => {
-            if (progress.loaded && fileStats.size) {
-                const percentage = progress.loaded / fileStats.size;
-                context.setProgress("Uploading to R2…", percentage);
-            }
+        await new Promise((resolve, reject) => {
+            const req = node_https_1.default.request({
+                hostname: host,
+                path: `/${encodedKey}`,
+                method: "PUT",
+                headers: request.headers,
+            }, (res) => {
+                if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                    resolve();
+                }
+                else {
+                    const chunks = [];
+                    res.on("data", (chunk) => chunks.push(chunk));
+                    res.on("end", () => reject(new Error(`HTTP ${res.statusCode}: ${Buffer.concat(chunks).toString()}`)));
+                }
+            });
+            req.on("error", reject);
+            const stream = (0, node_fs_1.createReadStream)(filePath);
+            let uploaded = 0;
+            stream.on("data", (chunk) => {
+                uploaded += Buffer.byteLength(chunk);
+                context.setProgress("Uploading to R2…", uploaded / fileStats.size);
+            });
+            stream.pipe(req);
         });
-        await upload.done();
         const baseUrl = publicUrl.replace(/\/$/, "");
-        const encodedKey = key.split("/").map(encodeURIComponent).join("/");
         const uploadUrl = `${baseUrl}/${encodedKey}`;
         context.copyToClipboard(uploadUrl);
         context.notify("R2 URL copied to the clipboard");
@@ -139,4 +160,4 @@ const r2 = {
         },
     },
 };
-export const shareServices = [r2];
+exports.shareServices = [r2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kap-r2",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Share on Cloudflare R2",
   "license": "MIT",
   "repository": "tristanremy/kap-r2",
@@ -8,8 +8,6 @@
     "name": "Tristan Remy",
     "url": "https://github.com/tristanremy"
   },
-  "type": "module",
-  "exports": "./dist/index.js",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -26,15 +24,15 @@
     "version": ">=3.0.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.728.0",
-    "@aws-sdk/lib-storage": "^3.728.0"
+    "aws4": "^1.13.2"
   },
   "devDependencies": {
+    "@types/aws4": "^1.11.6",
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=14"
   },
   "scripts": {
     "build": "tsc"