dxfl 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.3.2
+
+- update `@aws-sdk/client-s3` 3.983.0 → 3.1004.0
+- `deploy`: fix failed request not being retried
+- AWS\_\* environment variables now override guichet credentials
+
+# v0.3.1
+
+- fix `deuxfleurs.toml`: always pass the user-provided value of index_page to garage
+
 # v0.3.0
 
 - improve `list` presentation

package/dist/auth.js

@@ -109,6 +109,11 @@ export function openApiConf() {
 }
 export function login(username) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (username == undefined) {
+            username = yield read({
+                prompt: "username: ",
+            });
+        }
         const password = yield read({
             prompt: "password: ",
             silent: true,

package/dist/bucket.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from "fs";
+import fs from "fs/promises";
 import mime from "mime";
 import { DeleteObjectCommand, DeleteObjectsCommand, HeadObjectCommand, ListObjectsV2Command, PutObjectCommand, S3Client, } from "@aws-sdk/client-s3";
 import { PromisePool } from "@supercharge/promise-pool";
@@ -17,19 +17,18 @@ import { GuichetApi } from "./guichet.js";
 import { parseEtag, toChunks, formatBytesHuman } from "./utils.js";
 export function getBucketCredentials(name) {
     return __awaiter(this, void 0, void 0, function* () {
+        const creds = credentialsFromEnv();
+        if (creds !== undefined) {
+            process.stdout.write("Using credentials from environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY\n");
+            return creds;
+        }
         if (yield apiConfExists()) {
             const guichet = new GuichetApi(yield openApiConf());
             return yield credentialsFromApi(guichet, name);
         }
-        else {
-            const creds = credentialsFromEnv();
-            if (creds === undefined) {
-                throw new ErrorMsg("Failed to load credentials.\n" +
-                    "You need to run 'dxfl login', " +
-                    "or define the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables.");
-            }
-            return creds;
-        }
+        throw new ErrorMsg("Failed to load credentials.\n" +
+            "You need to run 'dxfl login', " +
+            "or define the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables.");
     });
 }
 function credentialsFromEnv() {
@@ -153,7 +152,12 @@ export function uploadFile(bucket, s3Path, localPath) {
         if (ContentType && ContentType.startsWith("text/")) {
             ContentType = ContentType + "; charset=utf-8";
         }
-        const Body = fs.createReadStream(localPath);
+        // NB: we read the entire file into memory instead of creating a stream from
+        // the file (which would allow streaming the data). Indeed, using a stream
+        // results in transcient network errors being throwned instead of being
+        // retried by the AWS SDK: https://github.com/aws/aws-sdk-js-v3/issues/6770
+        // which we want to avoid...
+        const Body = yield fs.readFile(localPath);
         const params = { Bucket: bucket.name, Key: s3Path, Body, ContentType };
         yield wrapS3Call(`upload "${s3Path}"`, [200], () => bucket.client.send(new PutObjectCommand(params)));
     });

package/dist/index.js

@@ -6,11 +6,11 @@ import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { vhostsList } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.3.0");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.3.2");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")
-    .argument("<username>", "your account username")
+    .argument("[username]", "your account username")
     .action(username => withHandleErrors(() => login(username)));
 program
     .command("list")

package/dist/website_config.js

@@ -143,8 +143,8 @@ function unescape(s) {
     }
 }
 function interpConfig(rawcfg) {
-    var _a, _b, _c, _d, _e;
-    function interpRedirect(i, r) {
+    var _a, _b, _c, _d, _e, _f;
+    function interpRedirect(r) {
         var _a, _b;
         const rfrom = withErrorMsg(() => unescape(r.from), msg => `from: ${msg}`);
         const rto = withErrorMsg(() => unescape(r.to), msg => `to: ${msg}`);
@@ -264,7 +264,7 @@ function interpConfig(rawcfg) {
         return s !== null && s !== void 0 ? s : def;
     };
     // use index.html as default index page
-    const index_page = withDefault(rawcfg.index_page, "index.html");
+    const index_page = (_a = rawcfg.index_page) !== null && _a !== void 0 ? _a : "index.html";
     // use error.html as default error page
     const error_page = withDefault(rawcfg.error_page, "error.html");
     let cfg = {
@@ -274,9 +274,9 @@ function interpConfig(rawcfg) {
         object_redirects: new Map(),
         cors_rules: [],
     };
-    for (const [i, raw] of ((_a = rawcfg.redirects) !== null && _a !== void 0 ? _a : []).entries()) {
+    for (const [i, raw] of ((_b = rawcfg.redirects) !== null && _b !== void 0 ? _b : []).entries()) {
         // `i+1` is only used for display: start counting redirects from 1 instead of 0
-        const r = withErrorMsg(() => interpRedirect(i + 1, raw), msg => `Redirect ${i + 1}: ${msg}`);
+        const r = withErrorMsg(() => interpRedirect(raw), msg => `Redirect ${i + 1}: ${msg}`);
         if (r.kind == "bucket") {
             cfg.bucket_redirects.push(r.r);
         }
@@ -287,15 +287,15 @@ function interpConfig(rawcfg) {
             cfg.object_redirects.set(r.from, r.to);
         }
     }
-    for (const [_, raw] of ((_b = rawcfg.cors) !== null && _b !== void 0 ? _b : []).entries()) {
+    for (const [_, raw] of ((_c = rawcfg.cors) !== null && _c !== void 0 ? _c : []).entries()) {
         const interpRawArray = (x) => {
             return typeof x === "string" ? [x] : x;
         };
         cfg.cors_rules.push({
             allowed_origins: interpRawArray(raw.allowed_origins),
-            allowed_methods: interpRawArray((_c = raw.allowed_methods) !== null && _c !== void 0 ? _c : ["GET", "HEAD"]),
-            allowed_headers: interpRawArray((_d = raw.allowed_methods) !== null && _d !== void 0 ? _d : []),
-            expose_headers: interpRawArray((_e = raw.expose_headers) !== null && _e !== void 0 ? _e : []),
+            allowed_methods: interpRawArray((_d = raw.allowed_methods) !== null && _d !== void 0 ? _d : ["GET", "HEAD"]),
+            allowed_headers: interpRawArray((_e = raw.allowed_methods) !== null && _e !== void 0 ? _e : []),
+            expose_headers: interpRawArray((_f = raw.expose_headers) !== null && _f !== void 0 ? _f : []),
         });
     }
     return cfg;
@@ -431,10 +431,10 @@ export function putBucketWebsiteConfig(bucket, index_page, error_page, bucket_re
     return __awaiter(this, void 0, void 0, function* () {
         // TODO: printing to show what changes are being applied?
         const WebsiteConfiguration = {};
-        if (error_page) {
+        if (error_page != undefined) {
             WebsiteConfiguration.ErrorDocument = { Key: error_page };
         }
-        if (index_page) {
+        if (index_page != undefined) {
             WebsiteConfiguration.IndexDocument = { Suffix: index_page };
         }
         if (bucket_redirects.length > 0) {
@@ -485,7 +485,7 @@ export function putCorsRules(bucket, cors_rules) {
                 ExposeHeaders: rule.expose_headers,
             });
         }
-        yield wrapS3Call(`when writing the bucket CORS config`, [200], () => bucket.client.send(new PutBucketCorsCommand({
+        yield wrapS3Call(`write the bucket CORS config`, [200], () => bucket.client.send(new PutBucketCorsCommand({
             Bucket: bucket.name,
             CORSConfiguration: { CORSRules },
         })));

package/doc/workflows/gh-actions.yml

@@ -3,7 +3,7 @@ name: Deploy with GitHub Actions
 # You will need to:
 # 1. Get (from Guichet web interface):
 #    - Your access keys (ID and secret): in the "S3" tab of your website
-#    - The website id: your sub-domain (the part before .web.deuxfleurs.fr) or your full custom domain (e.g. your-domain.com)
+#    - The website id: your sub-domain (e.g. something.deuxfleurs.eu|page) or your full custom domain (e.g. your-domain.com)
 # 2. Setup the access keys as secrets in GitHub web interface (https://docs.github.com/en/actions/how-tos/writing-workflows/choosing-what-your-workflow-does/using-secrets-in-github-actions), named in this example key_id and key_secret
 # 3. If you use a deuxfleurs.toml config, be sure the dxfl deploy command is launch in the current directory its in.
 

package/doc/workflows/woodpecker.yml

@@ -3,7 +3,7 @@
 # You will need to:
 # 1. Get (from Guichet web interface):
 #    - Your access keys (ID and secret): in the "S3" tab of your website
-#    - The website id: your sub-domain (the part before .web.deuxfleurs.fr) or your full custom domain (e.g. your-domain.com)
+#    - The website id: your sub-domain (e.g. something.deuxfleurs.eu|page) or your full custom domain (e.g. your-domain.com)
 # 2. Setup the access keys as secrets in Woodpecker web interface (https://woodpecker-ci.org/docs/usage/secrets), named in this example key_id and key_secret
 # 3. If you use a deuxfleurs.toml config, be sure the dxfl deploy command is launch in the current directory its in.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -20,18 +20,18 @@
     "prettier-check": "npx prettier . --check"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.750.0",
-    "@commander-js/extra-typings": "^13.1.0",
+    "@aws-sdk/client-s3": "^3.1004.0",
+    "@commander-js/extra-typings": "^14.0.0",
     "@supercharge/promise-pool": "^3.2.0",
-    "@types/node": "^22.13.5",
+    "@types/node": "^25.2.1",
     "cli-color": "^2.0.4",
-    "commander": "^13.1.0",
-    "fast-uri": "^3.0.6",
+    "commander": "^14.0.3",
+    "fast-uri": "^3.1.0",
     "guichet-sdk-ts": "^0.1.0",
-    "mime": "^4.0.6",
-    "read": "^4.1.0",
-    "smol-toml": "^1.3.4",
-    "typescript": "^5.7.3",
+    "mime": "^4.1.0",
+    "read": "^5.0.1",
+    "smol-toml": "^1.6.0",
+    "typescript": "^5.9.3",
     "zod": "^3.24.4",
     "zod-validation-error": "^3.4.1"
   },