@dynamicweb/cli 1.0.8 → 1.0.10

package/bin/commands/command.js

@@ -83,6 +83,7 @@ async function runCommand(env, user, command, queryParams, data) {
     })
     if (!res.ok) {
         console.log(`Error when doing request ${res.url}`)
+        process.exit(1);
     }
     return await res.json()
 }

package/bin/commands/database.js

@@ -58,7 +58,7 @@ async function download(env, user, path, verbose) {
         return res;
     }).then(async (res) => {
         if (!res) {
-            return;
+            process.exit(1);
         }
         const fileStream = fs.createWriteStream(_path.resolve(`${_path.resolve(path)}/${filename}`));
         await new Promise((resolve, reject) => {

package/bin/commands/files.js

@@ -104,6 +104,7 @@ async function handleFiles(argv) {
             if (argv.recursive) {
                 await processDirectory(env, user, resolvedPath, argv.outPath, resolvedPath, argv.createEmpty, true, argv.overwrite);
             } else {
+                console.log(resolvedPath)
                 let filesInDir = getFilesInDirectory(resolvedPath);
                 await uploadFiles(env, user, filesInDir, argv.outPath, argv.createEmpty, argv.overwrite);
             }
@@ -112,7 +113,7 @@ async function handleFiles(argv) {
 }
 
 function getFilesInDirectory(dirPath) {
-    return fs.readdirSync(dirPath)
+    return fs.statSync(dirPath).isFile() ? [ dirPath ] : fs.readdirSync(dirPath)
             .map(file => path.join(dirPath, file))
             .filter(file => fs.statSync(file).isFile());
 }
@@ -237,6 +238,8 @@ async function getFilesStructure(env, user, dirPath, recursive, includeFiles) {
         return await res.json();
     } else {
         console.log(res);
+        console.log(res.json());
+        process.exit(1);
     }
 }
 
@@ -247,8 +250,11 @@ export async function uploadFiles(env, user, localFilePaths, destinationPath, cr
     form.append('skipExistingFiles', String(!overwrite));
     form.append('allowOverwrite', String(overwrite));
     localFilePaths.forEach((localPath, index) => {
-        console.log(localPath)
-        form.append('files', fs.createReadStream(path.resolve(localPath)));
+        let fileToUpload = resolveFilePath(localPath)
+        console.log(fileToUpload)
+        if (fileToUpload === undefined)
+            return;
+        form.append('files', fs.createReadStream(path.resolve(fileToUpload)));
     });
     let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/Upload?` + new URLSearchParams({"createEmptyFiles": createEmpty, "createMissingDirectories": true}), {
         method: 'POST',
@@ -265,6 +271,26 @@ export async function uploadFiles(env, user, localFilePaths, destinationPath, cr
     else {
         console.log(res)
         console.log(res.json())
-        return;
+        process.exit(1);
+    }
+}
+
+export function resolveFilePath(filePath) {
+    let p = path.parse(path.resolve(filePath))
+    let regex = wildcardToRegExp(p.base);
+    let resolvedPath = fs.readdirSync(p.dir).filter((allFilesPaths) => allFilesPaths.match(regex) !== null)[0]
+    if (resolvedPath === undefined)
+    {
+        console.log('Could not find any files with the name ' + filePath);
+        process.exit(1);
     }
+    return path.join(p.dir, resolvedPath);
+}
+
+function wildcardToRegExp(wildcard) {
+    return new RegExp('^' + wildcard
+      .replace(/\./g, '\\.')
+      .replace(/\*/g, '.*')
+      .replace(/\?/g, '.')
+      + '$');
 }

package/bin/commands/install.js

@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import path from 'path';
 import { setupEnv, getAgent } from './env.js';
 import { setupUser } from './login.js';
-import { uploadFiles } from './files.js';
+import { uploadFiles, resolveFilePath } from './files.js';
 
 export function installCommand() {
     return {
@@ -24,9 +24,8 @@ export function installCommand() {
 async function handleInstall(argv) {
     let env = await setupEnv(argv);
     let user = await setupUser(argv, env);
-    let resolvedPath = path.resolve(argv.filePath)
-    await uploadFiles(env, user, [resolvedPath], 'System/AddIns/Local', false, true);
-    await installAddin(env, user, resolvedPath)
+    await uploadFiles(env, user, [ argv.filePath ], 'System/AddIns/Local', false, true);
+    await installAddin(env, user, resolveFilePath(argv.filePath))
 }
 
 async function installAddin(env, user, resolvedPath) {
@@ -54,5 +53,6 @@ async function installAddin(env, user, resolvedPath) {
     else {
         console.log('Request failed, returned error:')
         console.log(await res.json())
+        process.exit(1);
     }
 }

package/bin/commands/login.js

@@ -135,6 +135,8 @@ async function login(username, password, env, protocol, verbose) {
     });
 
     if (res.ok) {
+        console.log(res)
+        console.log(res.json())
         let user = parseCookies(res.headers.get('set-cookie')).user;
         if (!user) return;
         return await getToken(user, env, protocol, verbose)

package/bin/commands/query.js

@@ -87,6 +87,7 @@ async function runQuery(env, user, query, params) {
     })
     if (!res.ok) {
         console.log(`Error when doing request ${res.url}`)
+        process.exit(1);
     }
     return await res.json()
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@dynamicweb/cli",
   "type": "module",
   "description": "Dynamicweb CLI is a commandline tool for interacting with Dynamicweb 10 solutions.",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "bin/index.js",
   "files": [
     "bin/*"