dxfl 0.4.0 → 0.4.2-alpha

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.4.2-alpha
+
+- Temporarily disabling CORS configuration
+
+# v0.4.1
+
+- Define required node version
+- Replace cli-color by native styleText
+
 # v0.4.0
 
 - `deploy`: allow to specify a custom config file with `--config-file` or `-c`

package/dist/deploy.js

@@ -13,7 +13,7 @@ import { PromisePool } from "@supercharge/promise-pool";
 import { deleteBucketFile, deleteBucketFiles, getBucketCredentials, getBucket, getBucketFiles, putEmptyObjectRedirect, uploadFile, } from "./bucket.js";
 import { ErrorMsg } from "./error.js";
 import { confirmationPrompt, filterMap, formatBytesHuman, formatCount, getFileMd5, sum, } from "./utils.js";
-import { equalBucketRedirect, equalCorsRules, getBucketConfig, putBucketWebsiteConfig, putCorsRules, readConfigFile, } from "./website_config.js";
+import { 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
 //    will typically use `\` as separator.
@@ -189,7 +189,11 @@ function printPlan(plan, details) {
     const oredirects_updated = plan.redirects.filter(r => r.action == "update");
     const oredirects_deleted = plan.redirects.filter(r => r.action == "delete");
     // check whether CORS rules changed
-    const cors_changed = !equalCorsRules(plan.cors_rules.from, plan.cors_rules.to);
+    // const cors_changed = !equalCorsRules(
+    // 	plan.cors_rules.from,
+    // 	plan.cors_rules.to,
+    // );
+    const cors_changed = false;
     // print
     if (details == "summary") {
         const sizeRemote = sum([...plan.remoteFiles.values()].map(f => { var _a; return (_a = f.size) !== null && _a !== void 0 ? _a : 0; }));
@@ -313,9 +317,9 @@ function applyDeployPlan(bucket, plan) {
         // Apply bucket redirects & global config
         yield putBucketWebsiteConfig(bucket, plan.index_page.to, plan.error_page.to, plan.bucket_redirects.to);
         // Apply CORS rules
-        if (!equalCorsRules(plan.cors_rules.from, plan.cors_rules.to)) {
-            yield putCorsRules(bucket, plan.cors_rules.to);
-        }
+        // if (!equalCorsRules(plan.cors_rules.from, plan.cors_rules.to)) {
+        // 	await putCorsRules(bucket, plan.cors_rules.to);
+        // }
     });
 }
 export function deploy(website, localFolder, options) {

package/dist/error.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { S3ServiceException } from "@aws-sdk/client-s3";
-import clc from "cli-color";
+import { styleText } from "node:util";
 export class ErrorCtx {
     constructor(ctx, error) {
         this.ctx = ctx;
@@ -83,10 +83,10 @@ export function wrapS3Call(context, expectedCodes, f) {
 // otherwise it is thrown as an exception.
 export function handleError(e) {
     if (e instanceof ErrorMsg) {
-        console.error(`${clc.red("Error:")} ${e.msg}`);
+        console.error(`${styleText("red", "Error:")} ${e.msg}`);
     }
     else if (e instanceof ErrorGuichet) {
-        let msg = clc.red("Error: ");
+        let msg = styleText("red", "Error: ");
         if (e.cause.kind == "Unauthorized") {
             msg +=
                 "failed to authenticate with Guichet. Is your password and login correct?";
@@ -97,7 +97,7 @@ export function handleError(e) {
         console.error(msg);
     }
     else {
-        console.error(clc.red("Unexpected error:") + "\n", e);
+        console.error(styleText("red", "Unexpected error:") + "\n", e);
     }
     process.exit(1);
 }

package/dist/guichet.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { WebsiteApi, } from "guichet-sdk-ts";
-import { textWarn } from "./utils.js";
+import { styleText } from "node:util";
 import { ErrorGuichet } from "./error.js";
 // The GuichetApi class wraps WebsiteApi (from the guichet sdk). It catches
 // errors that can happen in normal use, and it turn them into a dedicated error type
@@ -45,7 +45,7 @@ export class GuichetApi {
                     // the migration of websites *.web.deuxfleurs.fr to bucket
                     // names with the full domain name.
                     // We just warn that this is a working but deprecated name.
-                    console.log(`${textWarn("Warning")}: the name "${vhost}" is now deprecated for this website,` +
+                    console.log(`${styleText("yellow", "Warning")}: the name "${vhost}" is now deprecated for this website,` +
                         ` you should use "${vhost}.web.deuxfleurs.fr" instead.`);
                 }
                 return websiteInfo;

package/dist/index.js

@@ -6,7 +6,7 @@ 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.4.0");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.4.2-alpha");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/dist/inspect.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { WebsiteApi } from "guichet-sdk-ts";
 import { openApiConf } from "./auth.js";
-import { formatBytesHuman, separator, textGreen, textGrey, } from "./utils.js";
-import clc from "cli-color";
+import { formatBytesHuman, separator } 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;
@@ -24,17 +24,18 @@ export function inspect(website, options) {
         if (!options.secret) {
             kSecret =
                 `**** ` +
-                    textGrey.italic(`(use \`dxfl inspect ${v === null || v === void 0 ? void 0 : v.name} --secret\` to reveal it)`);
+                    styleText(["gray", "italic"], `(use \`dxfl inspect ${v === null || v === void 0 ? void 0 : v.name} --secret\` to reveal it)`);
         }
-        console.log(textGreen.bold(`${v === null || v === void 0 ? void 0 : v.name} details`));
+        console.log(styleText(["green", "bold"], `${v === null || v === void 0 ? void 0 : v.name} details`));
         console.log(separator());
-        console.log(`  ${clc.bold("id")}: ${v === null || v === void 0 ? void 0 : v.name}`);
-        console.log(`  ${clc.bold("url")}: ${clc.underline("https://" + (v === null || v === void 0 ? void 0 : v.domain))}`);
-        console.log(`  ${clc.bold("usage")}:`, `${formatBytesHuman((_a = q === null || q === void 0 ? void 0 : q.current) !== null && _a !== void 0 ? _a : 0)} / ${formatBytesHuman((_b = q === null || q === void 0 ? void 0 : q.max) !== null && _b !== void 0 ? _b : 0)}`, `(${Math.round(((_c = q === null || q === void 0 ? void 0 : q.ratio) !== null && _c !== void 0 ? _c : 0) * 100)}%)`);
-        console.log(`  ${clc.bold("S3 keys")}:`);
-        console.log(`    ${clc.bold("access_key_id")}: ${kId}`);
-        console.log(`    ${clc.bold("secret_access_key")}: ${kSecret}`);
+        console.log(`  ${styleText("bold", "id")}: ${v === null || v === void 0 ? void 0 : v.name}`);
+        console.log(`  ${styleText("bold", "url")}: ${styleText("underline", "https://" + (v === null || v === void 0 ? void 0 : v.domain))}`);
+        console.log(`  ${styleText("bold", "usage")}:`, `${formatBytesHuman((_a = q === null || q === void 0 ? void 0 : q.current) !== null && _a !== void 0 ? _a : 0)} / ${formatBytesHuman((_b = q === null || q === void 0 ? void 0 : q.max) !== null && _b !== void 0 ? _b : 0)}`, `(${Math.round(((_c = q === null || q === void 0 ? void 0 : q.ratio) !== null && _c !== void 0 ? _c : 0) * 100)}%)`);
+        console.log(`  ${styleText("bold", "S3 keys")}:`);
+        console.log(`    ${styleText("bold", "access_key_id")}: ${kId}`);
+        console.log(`    ${styleText("bold", "secret_access_key")}: ${kSecret}`);
         console.log(separator());
-        console.log(textGrey.italic(`→ For more information and features, you can visit the web UI:`, `${clc.underline("https://guichet.deuxfleurs.fr/website/inspect/" + (v === null || v === void 0 ? void 0 : v.name))}`));
+        console.log(styleText(["gray", "italic"], `→ For more information and features, you can visit the web UI: ` +
+            `${styleText("underline", "https://guichet.deuxfleurs.fr/website/inspect/" + (v === null || v === void 0 ? void 0 : v.name))}`));
     });
 }

package/dist/utils.js

@@ -19,11 +19,7 @@ import crypto from "crypto";
 import { stdin, stdout } from "process";
 import readline from "readline/promises";
 import { ErrorMsg } from "./error.js";
-import clc from "cli-color";
-export const textGreen = clc.green;
-export const textWarn = clc.yellow;
-export const textError = clc.red;
-export const textGrey = clc.xterm(242);
+import { styleText } from "node:util";
 export function getFileMd5(file) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, e_1, _b, _c;
@@ -132,5 +128,5 @@ export function separator(size = 42) {
     for (let i = 0; i < size; i++) {
         dashes += "-";
     }
-    return textGrey(dashes);
+    return styleText("gray", dashes);
 }

package/dist/vhosts.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { WebsiteApi } from "guichet-sdk-ts";
 import { openApiConf } from "./auth.js";
-import { separator, textGreen } from "./utils.js";
-import clc from "cli-color";
+import { separator } from "./utils.js";
+import { styleText } from "node:util";
 export function vhostsList() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -24,9 +24,9 @@ export function vhostsList() {
             if (i === 0) {
                 console.log(separator());
             }
-            console.log(textGreen(v.name));
-            console.log(`  ${clc.bold("id")}: ${v.name}`);
-            console.log(`  ${clc.bold("url")}: ${clc.underline("https://" + v.domain)}`);
+            console.log(styleText("green", v.name || ""));
+            console.log(`  ${styleText("green", "id")}: ${v.name}`);
+            console.log(`  ${styleText("bold", "url")}: ${styleText("underline", "https://" + v.domain)}`);
             console.log(separator());
         });
     });

package/dist/website_config.js

@@ -12,7 +12,7 @@ import TOML from "smol-toml";
 import URI from "fast-uri";
 import { z as zod } from "zod";
 import { fromError as zodError } from "zod-validation-error";
-import { GetBucketCorsCommand, GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, } from "@aws-sdk/client-s3";
+import { GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, } from "@aws-sdk/client-s3";
 import { ErrorMsg, withErrorMsg, wrapS3Call } from "./error.js";
 import { getBucketFilesDetails } from "./bucket.js";
 ////////////// Utilities
@@ -324,12 +324,14 @@ export function getBucketConfig(bucket, files) {
         // - A Head command for each file in the bucket to collect object redirects.
         //   (This can become relatively slow for buckets with thousands of files,
         //    but I don't know of a better way.)
-        var _a, _b, _c, _d, _e, _f;
-        const [website, cors, details] = yield Promise.all([
+        var _a, _b;
+        const [website, details] = yield Promise.all([
             // 204 "No Content" is returned when there is no existing website config
             wrapS3Call(`read the bucket website config`, [200, 204], () => bucket.client.send(new GetBucketWebsiteCommand({ Bucket: bucket.name }))),
             // 204 "No Content" is returned when there are no existing CORS rules
-            wrapS3Call(`read the bucket CORS config`, [200, 204], () => bucket.client.send(new GetBucketCorsCommand({ Bucket: bucket.name }))),
+            // wrapS3Call(`read the bucket CORS config`, [200, 204], () =>
+            // 	bucket.client.send(new GetBucketCorsCommand({ Bucket: bucket.name })),
+            // ),
             getBucketFilesDetails(bucket, files),
         ]);
         // Collect object redirects
@@ -340,7 +342,8 @@ export function getBucketConfig(bucket, files) {
             }
         }
         // Interpret bucket redirects
-        if (website.RedirectAllRequestsTo) {
+        if (website.RedirectAllRequestsTo &&
+            "HostName" in website.RedirectAllRequestsTo) {
             // NB: garage does not currently support RedirectAllRequestsTo so this should never happen
             throw new ErrorMsg(`remote website configuration: RedirectAllRequestsTo is specified; ` +
                 `this is currently unsupported by dxfl`);
@@ -414,16 +417,16 @@ export function getBucketConfig(bucket, files) {
         }
         // Interpret CORS rules
         let cors_rules = [];
-        if (cors.CORSRules) {
-            for (const rule of cors.CORSRules) {
-                cors_rules.push({
-                    allowed_origins: (_c = rule.AllowedOrigins) !== null && _c !== void 0 ? _c : [],
-                    allowed_methods: (_d = rule.AllowedMethods) !== null && _d !== void 0 ? _d : [],
-                    allowed_headers: (_e = rule.AllowedHeaders) !== null && _e !== void 0 ? _e : [],
-                    expose_headers: (_f = rule.ExposeHeaders) !== null && _f !== void 0 ? _f : [],
-                });
-            }
-        }
+        // if (cors.CORSRules) {
+        // 	for (const rule of cors.CORSRules) {
+        // 		cors_rules.push({
+        // 			allowed_origins: rule.AllowedOrigins ?? [],
+        // 			allowed_methods: rule.AllowedMethods ?? [],
+        // 			allowed_headers: rule.AllowedHeaders ?? [],
+        // 			expose_headers: rule.ExposeHeaders ?? [],
+        // 		});
+        // 	}
+        // }
         return {
             index_page,
             error_page,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.4.0",
+  "version": "0.4.2-alpha",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -13,6 +13,9 @@
   "bin": {
     "dxfl": "dist/index.js"
   },
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "prepare": "npx tsc",
     "prettier": "npx prettier . --write",
@@ -24,7 +27,6 @@
     "@commander-js/extra-typings": "^14.0.0",
     "@supercharge/promise-pool": "^3.2.0",
     "@types/node": "^25.2.1",
-    "cli-color": "^2.0.4",
     "commander": "^14.0.3",
     "fast-uri": "^3.1.0",
     "guichet-sdk-ts": "^0.1.0",
@@ -36,7 +38,6 @@
     "zod-validation-error": "^3.4.1"
   },
   "devDependencies": {
-    "@types/cli-color": "^2.0.6",
     "onchange": "^7.1.0",
     "prettier": "3.5.3"
   }