directus-template-cli 0.5.0-beta.14 → 0.5.0-beta.16

package/dist/lib/extract/extract-assets.js

@@ -6,7 +6,6 @@ const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const promises_1 = require("node:stream/promises");
 const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
@@ -14,11 +13,18 @@ async function getAssetList() {
     return sdk_2.api.client.request((0, sdk_1.readFiles)({ limit: -1 }));
 }
 async function downloadFile(file, dir) {
-    const response = await sdk_2.api.client.request((0, sdk_1.readAssetRaw)(file.id));
+    const response = await sdk_2.api.client.request(() => ({
+        method: 'GET',
+        path: `/assets/${file.id}`,
+    }));
     const fullPath = node_path_1.default.join(dir, 'assets', file.filename_disk);
-    await (0, promises_1.pipeline)(
-    // @ts-ignore
-    response, node_fs_1.default.createWriteStream(fullPath));
+    if (typeof response === 'string') {
+        node_fs_1.default.writeFileSync(fullPath, response);
+    }
+    else {
+        const data = await response.arrayBuffer();
+        node_fs_1.default.writeFileSync(fullPath, Buffer.from(data));
+    }
 }
 async function downloadAllFiles(dir) {
     core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, 'Downloading assets'));

package/dist/lib/sdk.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.api = exports.DirectusError = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
+const core_1 = require("@oclif/core");
 const bottleneck_1 = tslib_1.__importDefault(require("bottleneck"));
 class DirectusError extends Error {
     constructor(response) {
@@ -57,12 +58,12 @@ class Api {
                 const statusCode = error.status;
                 if (statusCode === 429) {
                     const delay = retryAfter ? Number.parseInt(retryAfter, 10) * 1000 : 60000;
-                    console.log(`-- Rate limited. Retrying after ${delay}ms`);
+                    core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Rate limited. Retrying after ${delay}ms`);
                     return delay;
                 }
                 if (statusCode === 503) {
                     const delay = retryAfter ? Number.parseInt(retryAfter, 10) * 1000 : 5000;
-                    console.log(`-- Server under pressure. Retrying after ${delay}ms`);
+                    core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Server under pressure. Retrying after ${delay}ms`);
                     return delay;
                 }
                 if (statusCode === 400) {
@@ -72,17 +73,17 @@ class Api {
             // For other errors, use exponential backoff, but only if we haven't exceeded retryCount
             if (jobInfo.retryCount < 3) {
                 const delay = Math.min(1000 * 2 ** jobInfo.retryCount, 30000);
-                console.log(`Request failed. Retrying after ${delay}ms`);
+                core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Request failed. Retrying after ${delay}ms`);
                 return delay;
             }
-            console.log('Max retries reached, not retrying further');
+            core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Max retries reached, not retrying further`);
         });
         this.limiter.on('retry', (error, jobInfo) => {
-            console.log(`Retrying job (attempt ${jobInfo.retryCount + 1})`);
+            core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Retrying job (attempt ${jobInfo.retryCount + 1})`);
         });
         this.limiter.on('depleted', empty => {
             if (empty) {
-                console.log('Rate limit quota depleted. Requests will be queued.');
+                core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Rate limit quota depleted. Requests will be queued.`);
             }
         });
     }

package/oclif.manifest.json

@@ -280,5 +280,5 @@
       ]
     }
   },
-  "version": "0.5.0-beta.14"
+  "version": "0.5.0-beta.16"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.5.0-beta.14",
+  "version": "0.5.0-beta.16",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "bin": {