dxfl 0.6.1 → 0.6.2

package/.prettierignore

@@ -1,3 +1,4 @@
 # Ignore artifacts:
 dist
 node_modules
+npm-shrinkwrap.json

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.6.2
+
+- `deploy`: Re-enable CORS configuration (disabled on v0.4.2)
+
 # v0.6.1
 
 - Dependencies bump

package/README.md

@@ -191,10 +191,13 @@ git clone https://git.deuxfleurs.fr/Deuxfleurs/dxfl
 cd dxfl
 npm install
 # build and install the tool as the `dxfl` command
-npm link
+npm run build
 dxfl
 # alternatively, run the tool from the sources directly
 npx dxfl
+# rebuild automatically on changes with:
+npm run dev
+
 ```
 
 ### Code formatting
@@ -220,7 +223,8 @@ Then to publish a release:
 vim CHANGELOG.md # update the version and its content in this file
 vim package.json # update the version in this file
 vim index.ts # update the version in this file
-npm install # update the version in the lock file
+npm install # update the version in the lock file and check security audit
+npm shrinkwrap # make suuuure the lock file is up to date
 npm run prettier # fix potential coding style problem
 git commit -a -m 'set version 0.1.5' # commit your change
 git push # send update

package/dist/deploy.js

@@ -14,7 +14,7 @@ import { deleteBucketFile, deleteBucketFiles, getBucketCredentials, getBucket, g
 import { ErrorMsg } from "./error.js";
 import { fileContentType, supportedHeaders, } from "./headers.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";
+import { evalHeadersRules, equalBucketRedirect, equalCorsRules, getBucketConfig, putBucketWebsiteConfig, putCorsRules, 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.
@@ -263,11 +263,7 @@ 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 = false;
+    const cors_changed = !equalCorsRules(plan.cors_rules.from, plan.cors_rules.to);
     // print
     if (details == "summary") {
         const sizeRemote = sum([...plan.remoteFiles.values()].map(f => { var _a; return (_a = f.size) !== null && _a !== void 0 ? _a : 0; }));
@@ -407,9 +403,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)) {
-        // 	await putCorsRules(bucket, plan.cors_rules.to);
-        // }
+        if (!equalCorsRules(plan.cors_rules.from, plan.cors_rules.to)) {
+            yield putCorsRules(bucket, plan.cors_rules.to);
+        }
         // Modify headers
         yield PromisePool.for(plan.modifyHeaders)
             .withConcurrency(50)

package/dist/index.js

@@ -6,7 +6,7 @@ import { deploy } from "./deploy.js";
 import { empty } from "./empty.js";
 import { list } from "./vhosts.js";
 import { inspect } from "./inspect.js";
-program.name("dxfl").description("Deuxfleurs CLI tool").version("0.6.1");
+program.name("dxfl").description("Deuxfleurs CLI tool").version("0.6.2");
 program
     .command("login")
     .description("Link your Deuxfleurs account with this tool.")

package/dist/website_config.js

@@ -13,7 +13,7 @@ import URI from "fast-uri";
 import picomatch from "picomatch";
 import { z as zod } from "zod";
 import { fromError as zodError } from "zod-validation-error";
-import { DeleteBucketCorsCommand, GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, } from "@aws-sdk/client-s3";
+import { DeleteBucketCorsCommand, GetBucketCorsCommand, GetBucketWebsiteCommand, PutBucketWebsiteCommand, PutBucketCorsCommand, S3ServiceException, } from "@aws-sdk/client-s3";
 import { ErrorMsg, withErrorMsg, wrapS3Call } from "./error.js";
 import { supportedHeaders } from "./headers.js";
 import { getBucketFilesDetails } from "./bucket.js";
@@ -375,14 +375,12 @@ 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;
-        const [website, details] = yield Promise.all([
+        var _a, _b, _c, _d, _e, _f;
+        const [website, cors, 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 })),
-            // ),
+            // 404 is returned when there are no existing CORS rules
+            wrapS3Call(`read the bucket CORS config`, [200, 404], () => getBucketCors(bucket)),
             getBucketFilesDetails(bucket, files),
         ]);
         // Collect object redirects
@@ -393,8 +391,7 @@ export function getBucketConfig(bucket, files) {
             }
         }
         // Interpret bucket redirects
-        if (website.RedirectAllRequestsTo &&
-            "HostName" in website.RedirectAllRequestsTo) {
+        if (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`);
@@ -468,16 +465,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: rule.AllowedOrigins ?? [],
-        // 			allowed_methods: rule.AllowedMethods ?? [],
-        // 			allowed_headers: rule.AllowedHeaders ?? [],
-        // 			expose_headers: rule.ExposeHeaders ?? [],
-        // 		});
-        // 	}
-        // }
+        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 : [],
+                });
+            }
+        }
         // Interpret headers
         let headers = new Map();
         for (const [file, { headers: file_headers }] of details) {
@@ -493,6 +490,25 @@ export function getBucketConfig(bucket, files) {
         };
     });
 }
+function getBucketCors(bucket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        try {
+            return yield bucket.client.send(new GetBucketCorsCommand({ Bucket: bucket.name }));
+        }
+        catch (e) {
+            if (e instanceof S3ServiceException && ((_a = e.$response) === null || _a === void 0 ? void 0 : _a.statusCode) == 404) {
+                return {
+                    CORSRules: [],
+                    $metadata: e.$metadata,
+                };
+            }
+            else {
+                throw e;
+            }
+        }
+    });
+}
 ////////////// Applying a configuration to S3
 // applies the bucket-wide part of the website configuration
 export function putBucketWebsiteConfig(bucket, index_page, error_page, bucket_redirects) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "dxfl",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "dxfl",
-      "version": "0.6.1",
+      "version": "0.6.2",
       "license": "EUPL-1.2",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.1014.0",
@@ -1854,7 +1854,9 @@
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
-      "os": ["darwin"],
+      "os": [
+        "darwin"
+      ],
       "engines": {
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
@@ -1944,7 +1946,9 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.0.tgz",
       "integrity": "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==",
-      "funding": ["https://github.com/sponsors/broofa"],
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
       "license": "MIT",
       "bin": {
         "mime": "bin/cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxfl",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "",
   "license": "EUPL-1.2",
   "author": "Deuxfleurs Team <coucou@deuxfleurs.fr>",
@@ -17,9 +17,11 @@
     "node": ">=20.0.0"
   },
   "scripts": {
+    "build": "npx tsc && npm link",
+    "dev": "npm link && npx onchange \"**/*.ts\" -- npx tsc",
     "prepare": "npx tsc",
     "prettier": "npx prettier . --write",
-    "prettier-watch": "npx -y onchange \"**/*\" -- npx prettier --write --ignore-unknown {{changed}}",
+    "prettier-watch": "npx onchange \"**/*\" -- npx prettier --write --ignore-unknown {{changed}}",
     "prettier-check": "npx prettier . --check"
   },
   "dependencies": {