dxfl 0.5.3 → 0.6.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.6.0
+
+- Allow passing a URL as the website name
+
+# v0.5.4, v0.5.5
+
+- Fix bug when deploying compressed files in subdirectories (introduced in 0.5.0)
+
 # v0.5.3
 
 - Update @aws-sdk/client-s3 to include patch for CVE-2026-26278 (cleaning 0.5.1 and 0.5.2)

package/README.md

@@ -146,26 +146,26 @@ allowed_origins = "https://www.example.com"
 # Required parameter.
 
 # HTTP methods allowed in a cross-origin request (in response to a preflight request).
-allowed_method = "GET"
+allowed_methods = "GET"
 # Possible values:
-# - allowed_method = "*" : wild card to allow all methods (only GET/HEAD are currently supported by the server)
-# - allowed_method = "GET" : string of http method ("GET" or "HEAD")
-# - allowed_method = ["GET", "HEAD"] : array of string http methods
+# - allowed_methods = "*" : wild card to allow all methods (only GET/HEAD are currently supported by the server)
+# - allowed_methods = "GET" : string of http method ("GET" or "HEAD")
+# - allowed_methods = ["GET", "HEAD"] : array of string http methods
 # Optional parameter. Default value: ["GET", "HEAD"]
 
 # Request headers allowed in a preflight request.
-allowed_header = "Authorization"
+allowed_headers = "Authorization"
 # Possible values:
-# - allowed_header = "*" : wildcard to allow all headers
-# - allowed_header = "Authorization" : string of http header
-# - allowed_header = ["Authorization", "Age"] : array of string http header
+# - allowed_headers = "*" : wildcard to allow all headers
+# - allowed_headers = "Authorization" : string of http header
+# - allowed_headers = ["Authorization", "Age"] : array of string http header
 # Optional parameter. Default value : []
 
 # Response headers you want to make available to JavaScript in response to a cross-origin request.
-expose_header = "Content-Encoding"
+expose_headers = "Content-Encoding"
 # Possible values:
-# - expose_header = "Content-Encoding" : string of http header
-# - expose_header = ["Content-Encoding", "Kuma-Revision"] : array of string http header
+# - expose_headers = "Content-Encoding" : string of http header
+# - expose_headers = ["Content-Encoding", "Kuma-Revision"] : array of string http header
 # Optional Parameter. Default value : []
 ```
 

package/dist/deploy.js

@@ -13,7 +13,7 @@ import { PromisePool } from "@supercharge/promise-pool";
 import { deleteBucketFile, deleteBucketFiles, getBucketCredentials, getBucket, getBucketFiles, putEmptyObjectRedirect, uploadFile, setObjectHeaders, } from "./bucket.js";
 import { ErrorMsg } from "./error.js";
 import { fileContentType, supportedHeaders, } from "./headers.js";
-import { confirmationPrompt, filterMap, formatBytesHuman, formatCount, getFileMd5, gzipFile, mapEq, mkTmpDir, sum, } from "./utils.js";
+import { confirmationPrompt, filterMap, formatBytesHuman, formatCount, getFileMd5, gzipFile, mapEq, mkTmpDir, sum, websiteIdBestEffort, } from "./utils.js";
 import { evalHeadersRules, equalBucketRedirect, getBucketConfig, putBucketWebsiteConfig, readConfigFile, } from "./website_config.js";
 // Walks through the local directory at path `dir`, and for each file it contains, returns :
 // - `localPath`: its path on the local filesystem (includes `dir`). On windows, this path
@@ -83,7 +83,10 @@ export function compressSelectedLocalFiles(localFiles, localCfg) {
             if (headers.compress) {
                 compressed = true;
                 if (headers.compress == "gzip") {
-                    const compressedPath = path.join(tmpDir, f.s3Path);
+                    // use the original file md5 as filename, this prevents conflicts
+                    // and is easier than reusing f.s3Path or f.localPath
+                    // (no need to create subdirectories or handle path delimiters portably)
+                    const compressedPath = path.join(tmpDir, f.md5);
                     yield gzipFile(localPath, compressedPath);
                     const [stat, compressedMd5] = yield Promise.all([
                         fs.promises.stat(compressedPath),
@@ -426,13 +429,15 @@ export function deploy(website, localFolder, options) {
         }
         // Read and validate the local configuration file before doing anything else
         const localWebsiteConfig = yield readConfigFile(options.configFile);
+        // Interpret the name of the website
+        const websiteId = websiteIdBestEffort(website);
         process.stdout.write("Fetching the website configuration and metadata...\n");
         const [localFiles, [bucket, remoteFiles, remoteWebsiteConfig]] = yield Promise.all([
             // Get paths & size of the local files to deploy
             getLocalFilesWithInfo(localFolder),
             // Get the bucket, list of files stored in the bucket, and bucket website config
             (() => __awaiter(this, void 0, void 0, function* () {
-                const bucket = yield getBucket(website, yield getBucketCredentials(website));
+                const bucket = yield getBucket(websiteId, yield getBucketCredentials(websiteId));
                 const remoteFiles = yield getBucketFiles(bucket);
                 // This can be slow because it needs to query each object in the bucket.
                 const remoteWebsiteConfig = yield getBucketConfig(bucket, [

package/dist/empty.js

@@ -9,14 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getBucket, getBucketCredentials, getBucketFiles, deleteBucketFiles, } from "./bucket.js";
 import { ErrorMsg } from "./error.js";
-import { confirmationPrompt, formatBytesHuman, formatCount, sum, } from "./utils.js";
+import { confirmationPrompt, formatBytesHuman, formatCount, sum, websiteIdBestEffort, } from "./utils.js";
 export function empty(website, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (options.dryRun && options.yes) {
             throw new ErrorMsg("options --yes and --dry-run cannot be passed at the same time");
         }
         process.stdout.write("Fetching the website configuration and metadata...\n");
-        const bucket = yield getBucket(website, yield getBucketCredentials(website));
+        // Interpret the name of the website
+        const websiteId = websiteIdBestEffort(website);
+        const bucket = yield getBucket(websiteId, yield getBucketCredentials(websiteId));
         const filesToDelete = [...(yield getBucketFiles(bucket))].map(([name, { size }]) => ({
             name,
             size,

package/dist/index.js

@@ -4,9 +4,9 @@ import { withHandleErrors } from "./error.js";
 import { login, logout } from "./auth.js";
 import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
-import { vhostsList } from "./vhosts.js";
+import { list } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.5.3");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.6.0");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")
@@ -15,7 +15,7 @@ program
 program
     .command("list")
     .description("List all your websites")
-    .action(() => withHandleErrors(vhostsList));
+    .action(() => withHandleErrors(list));
 program
     .command("inspect")
     .description("Show your website details")

package/dist/inspect.js

@@ -9,14 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { WebsiteApi } from "guichet-sdk-ts";
 import { openApiConf } from "./auth.js";
-import { formatBytesHuman, separator } from "./utils.js";
+import { formatBytesHuman, separator, websiteIdBestEffort } from "./utils.js";
 import { styleText } from "node:util";
 export function inspect(website, options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
+        const websiteId = websiteIdBestEffort(website); // Interpret the name of the website
         const conf = yield openApiConf();
         const web = new WebsiteApi(conf);
-        let siteData = yield web.getWebsite({ vhost: website });
+        let siteData = yield web.getWebsite({ vhost: websiteId });
         const q = siteData.quotaSize;
         const v = siteData.vhost;
         const kId = siteData === null || siteData === void 0 ? void 0 : siteData.accessKeyId;

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../auth.ts","../bucket.ts","../deploy.ts","../empty.ts","../error.ts","../guichet.ts","../headers.ts","../index.ts","../inspect.ts","../utils.ts","../vhosts.ts","../website_config.ts"],"version":"5.9.3"}

package/dist/utils.js

@@ -23,6 +23,7 @@ import { pipeline } from "node:stream/promises";
 import { styleText } from "node:util";
 import zlib from "node:zlib";
 import readline from "readline/promises";
+import URI from "fast-uri";
 import { ErrorMsg } from "./error.js";
 export function getFileMd5(file) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -150,3 +151,15 @@ export function mapEq(m1, m2) {
     return (m1.size === m2.size &&
         Array.from(m1.keys()).every(key => m1.get(key) == m2.get(key)));
 }
+// Accept {http,https}://website{,/} as identifier for "website".
+// (Useful to allow copy-pasting URLs into the terminal.)
+export function websiteIdBestEffort(website) {
+    const asURI = URI.parse(website);
+    if (!asURI.error &&
+        asURI.host &&
+        (asURI.scheme == "http" || asURI.scheme == "https") &&
+        (asURI.path == "" || asURI.path == "/")) {
+        return asURI.host;
+    }
+    return website;
+}

package/dist/vhosts.js

@@ -11,7 +11,7 @@ import { WebsiteApi } from "guichet-sdk-ts";
 import { openApiConf } from "./auth.js";
 import { separator } from "./utils.js";
 import { styleText } from "node:util";
-export function vhostsList() {
+export function list() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const conf = yield openApiConf();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -23,7 +23,7 @@
     "prettier-check": "npx prettier . --check"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1012.0",
+    "@aws-sdk/client-s3": "^3.1014.0",
     "@commander-js/extra-typings": "^14.0.0",
     "@supercharge/promise-pool": "^3.2.0",
     "@types/node": "^25.2.1",
@@ -42,10 +42,5 @@
   "devDependencies": {
     "onchange": "^7.1.0",
     "prettier": "3.5.3"
-  },
-  "overrides": {
-    "@aws-sdk/xml-builder": {
-      "fast-xml-parser": "^5.5.6"
-    }
   }
 }