@caweb/cli 1.3.1 → 1.3.2

package/commands/env/start.js

@@ -149,11 +149,9 @@ export default async function start({
 
 		// Create an Application Password for the user.
 		/*
-		const devAppPwd = await runCmd(
-				'php',
+		const devAppPwd = await runCLICmd(
+				'wp',
 					[
-						path.join(projectPath, 'bin', 'wp-cli.phar'),
-						`--ssh=docker:${path.basename(workDirectoryPath)}-cli-1`,
 						`user application-password create 1 caweb`,
 						'--porcelain'
 					]

package/commands/sync.js

@@ -26,12 +26,14 @@ const errors = [];
  * @param {boolean} options.from   Remote Site URL with current changes.
  * @param {boolean} options.to   Destination Site URL that should be synced.
  * @param {boolean} options.debug   True if debug mode is enabled.
+ * @param {Array} options.tax   Taxonomy that should be synced.
  */
 export default async function sync({
 	spinner,
 	debug,
 	from,
-    to
+    to,
+    tax
 } ) {
 
     const localFile = path.join(appPath, 'caweb.json');
@@ -90,8 +92,16 @@ export default async function sync({
             'accept': '*/*'
         }
     }
-        
+
+    let pages = [];
+    let posts = [];
+    let attachedMedia = [];
+    let featuredMedia = [];
+    let menus = [];
+    let menuNavItems = [];
+
     // get all settings 
+    // site settings are always synced
     spinner.text = `Getting Site Settings from ${from.url}`;
     let settings = await getTaxonomies({
         ...fromOptions,
@@ -101,122 +111,163 @@ export default async function sync({
         ],
     }, 'settings')
     
-    // get all pages/posts
-    spinner.text = `Gathering all pages/posts from ${from.url}`;
-    let pages = await getTaxonomies(fromOptions);
-    let posts = await getTaxonomies(fromOptions, 'posts');
-
-    spinner.text = `Collecting all attached/featured images from ${from.url}`;
     /**
-     * Media Library Handling
-     * 1) attached media items by default are only possible on pages.
-     * 2) featured media by default are only possible on posts.
+     * If taxonomy is undefined then we sync everything, otherwise we only sync what's being requested.
+     * First we collect everything we need from the base, then we send the information to the target.
+     * If media is requested then we need to download posts/pages to get any attached/featured media.
      */
-    const mediaFields = [
-        'id', 
-        'source_url', 
-        'title', 
-        'caption', 
-        'alt_text', 
-        'date',
-        'mime_type'
-    ];
-    let attachedMedia = await getTaxonomies({ 
-            ...fromOptions, 
-            fields: mediaFields,
-            parent: pages.map((p) => { return p.id })
-        }, 
-        'media'
-    );
-
-    let featuredMedia = await getTaxonomies({ 
-            ...fromOptions, 
-            fields: mediaFields,
-            include: posts.map((p) => { if(p.featured_media){return p.featured_media } })
-        }, 
-        'media'
-    );
-    
-    // before we can upload media files.
-    for( let mediaObj of [].concat( attachedMedia, featuredMedia ) ){
-        // generate a blob from the media object source_url.
-        const mediaBlob = await axios.request( 
-            {
-                ...fromOptions,
-                url: mediaObj.source_url,
-                responseType: 'arraybuffer'
-            } 
-        )
-        .then( (img) => {  return new Blob([img.data]) })
-        .catch( (error) => {
-            errors.push(`${mediaObj.source_url} could not be downloaded.`)
-            return false;
-        });
+    // collect pages
+    if( undefined === tax || tax.includes('pages') || tax.includes('media')){
+        // get all pages/posts
+        spinner.text = `Gathering all pages from ${from.url}`;
+        pages = await getTaxonomies(fromOptions);
+    }
+
+    // collect posts
+    if( undefined === tax || tax.includes('posts')|| tax.includes('media')){
+        // get all pages/posts
+        spinner.text = `Gathering all posts from ${from.url}`;
+        posts = await getTaxonomies(fromOptions, 'posts');
+    }
+
+    // collect media
+    if( undefined === tax || tax.includes('media')){
+       
+        spinner.text = `Collecting all attached/featured images from ${from.url}`;
+        /**
+         * Media Library Handling
+         * 1) attached media items by default are only possible on pages.
+         * 2) featured media by default are only possible on posts.
+         */
+        const mediaFields = [
+            'id', 
+            'source_url', 
+            'title', 
+            'caption', 
+            'alt_text', 
+            'date',
+            'mime_type'
+        ];
+        attachedMedia = await getTaxonomies({ 
+                ...fromOptions, 
+                fields: mediaFields,
+                parent: pages.map((p) => { return p.id })
+            }, 
+            'media'
+        );
+
+        featuredMedia = await getTaxonomies({ 
+                ...fromOptions, 
+                fields: mediaFields,
+                include: posts.map((p) => { if(p.featured_media){return p.featured_media } })
+            }, 
+            'media'
+        );
         
-        if( mediaBlob ){
-            mediaObj.data = mediaBlob;
+        // before we can upload media files.
+        for( let mediaObj of [].concat( attachedMedia, featuredMedia ) ){
+            // generate a blob from the media object source_url.
+            const mediaBlob = await axios.request( 
+                {
+                    ...fromOptions,
+                    url: mediaObj.source_url,
+                    responseType: 'arraybuffer'
+                } 
+            )
+            .then( (img) => {  return new Blob([img.data]) })
+            .catch( (error) => {
+                errors.push(`${mediaObj.source_url} could not be downloaded.`)
+                return false;
+            });
+            
+            if( mediaBlob ){
+                mediaObj.data = mediaBlob;
+            }
         }
     }
-    
-    spinner.text = `Collecting assigned navigation menus from ${from.url}`;
-    // get all menus and navigation links
-    let menus = await getTaxonomies({
-        ...fromOptions,
-        fields: [
-            'id',
-            'description',
-            'name',
-            'slug',
-            'meta',
-            'locations'
-        ]
-        }, 'menus');
-
-    let menuNavItems = await getTaxonomies( 
-        {
+
+    // collect menu and nav items.
+    if( undefined === tax || tax.includes('menus')){
+        spinner.text = `Collecting assigned navigation menus from ${from.url}`;
+        // get all menus and navigation links
+        menus = await getTaxonomies({
             ...fromOptions,
             fields: [
                 'id',
-                'title',
-                'url',
-                'status',
-                'attr_title',
                 'description',
-                'type',
-                'type_label',
-                'object',
-                'object_id',
-                'parent',
-                'menu_order',
-                'target',
-                'classes',
-                'xfn',
+                'name',
+                'slug',
                 'meta',
-                'menus'
-            ],
-            menus: menus.map((menu) => { return menu.id; })
-        }, 
-        'menu-items'
-        )
+                'locations'
+            ]
+            }, 'menus');
     
-    // create all pages/posts
-    spinner.text = `Creating all pages/posts to ${to.url}`;
-    await createTaxonomies( pages, toOptions, 'pages', spinner );
-    await createTaxonomies( posts, toOptions, 'posts', spinner );
+        menuNavItems = await getTaxonomies( 
+            {
+                ...fromOptions,
+                fields: [
+                    'id',
+                    'title',
+                    'url',
+                    'status',
+                    'attr_title',
+                    'description',
+                    'type',
+                    'type_label',
+                    'object',
+                    'object_id',
+                    'parent',
+                    'menu_order',
+                    'target',
+                    'classes',
+                    'xfn',
+                    'meta',
+                    'menus'
+                ],
+                menus: menus.map((menu) => { return menu.id; })
+            }, 
+            'menu-items'
+            )
+
+    }
+
+    /**
+     * Now we have all the data we can begin to create the taxonomies on the target.
+     * 
+     * Creation order is important otherwise missing dependencies will cause errors to trigger.
+     * We create media first, then pages, then posts, then menus and navigation links.
+     */
 
     // create media attachments
-    spinner.text = `Uploading media files to ${to.url}`;
-    await createTaxonomies(
-        [].concat( attachedMedia, featuredMedia ).filter((img) => { return img.data }), 
-        toOptions, 
-        'media', 
-        spinner
-        )
-        
+    if( undefined === tax || tax.includes('media')){
+        spinner.text = `Uploading media files to ${to.url}`;
+        await createTaxonomies(
+            [].concat( attachedMedia, featuredMedia ).filter((img) => { return img.data }), 
+            toOptions, 
+            'media', 
+            spinner
+            )
+    }
+
+     // create pages
+    if( undefined === tax || tax.includes('pages')){
+        spinner.text = `Creating all pages to ${to.url}`;
+        await createTaxonomies( pages, toOptions, 'pages', spinner );
+    }
+
+     // create posts
+    if( undefined === tax || tax.includes('posts')){
+        spinner.text = `Creating all posts to ${to.url}`;
+        await createTaxonomies( posts, toOptions, 'posts', spinner );
+    }
+
     // create menus and navigation links
-    spinner.text = `Reconstructing navigation menus to ${to.url}`;
-    await createTaxonomies(menus, toOptions, 'menus', spinner);
-    await createTaxonomies(menuNavItems, toOptions, 'menu-items', spinner);
+    if( undefined === tax || tax.includes('menus')){
+        spinner.text = `Reconstructing navigation menus to ${to.url}`;
+        await createTaxonomies(menus, toOptions, 'menus', spinner);
+        await createTaxonomies(menuNavItems, toOptions, 'menu-items', spinner);
+    }
+    
 
     // update settings
     await createTaxonomies(settings, toOptions, 'settings', spinner);

package/commands/test.js

@@ -2,24 +2,22 @@
  * External dependencies
  */
 import path from 'path';
-import axios from 'axios';
 import fs from 'fs';
 import loadConfig from '@wordpress/env/lib/config/load-config.js';
-import cp from 'child_process';
+import os from 'os';
 
 //var WP = require('wp-cli');
 /**
  * Internal dependencies
  */
 import { runCLICmds, runCmd, projectPath } from '../lib/index.js';
+import { CAWEB_OPTIONS, DIVI_OPTIONS } from '../lib/wordpress/index.js';
 /*
 import generateOverridesMD from '../admin.js';
-import { CAWEB_OPTIONS, DIVI_OPTIONS } from '../options.js';
 */
 /**
  * Promisified dependencies
  */
-import os from 'os';
 
 /**
  * Test code.
@@ -36,65 +34,21 @@ export default async function test({
 } ) {
 	
 	spinner.text = "Testing Code Functionality";
-		const config = await loadConfig(path.resolve('.'));
-		
-		process.env.WP_CLI_CONFIG_PATH  = path.join(config.workDirectoryPath, 'config.yml');
-	 // update post meta.
-	 let id = 35;
-	 let newId = 30
-	 let tbl = `wp_term_taxonomy`;
+	const config = await loadConfig(path.resolve('.'));
+	const { workDirectoryPath } = config;	
+	process.env.WP_CLI_CONFIG_PATH  = path.join(config.workDirectoryPath, 'config.yml');
 
-		let result = await runCmd(
+	let cawebOptNames = CAWEB_OPTIONS;
+
+	let result = await runCmd(
                     'php',
                     [
-                        path.join(projectPath, 'bin', 'wp-cli.phar'),
-						'--ssh=docker:' + path.basename(config.workDirectoryPath) + '-cli-1',
-                        `db query 'UPDATE ${tbl} SET term_taxonomy_id=${newId},term_id=${newId} WHERE term_id=${id}'`,
+						//'--info'
                     ]
                 )
 
-				console.log( result );
-		/*
-		let q = `UPDATE wp_posts SET id=1 WHERE id=10 `;
-		let u = 'http://danny.com/wp-json/wp/v2/pages/2827';
-		let result = await axios.request({
-			url: u,
-			method: 'POST',
-			data: {
-				title: 'Audio',
-				meta: {
-					_et_pb_use_builder: 'on'
-				}
-			},
-			headers: {
-				Authorization: 'Basic ' + Buffer.from(`admin:9RUG nPuo u581 cY2A uSJd FE2P`).toString('base64')
-			}
-		})
-		.then( async (res) => { return res.data; } )
-		.catch( async (err) => { return err; } )
-
-		*/
-		/*
-		let result = await runCmd(
-			'php', 
-			[
-				//'-r',
-				path.join(projectPath, 'bin', 'wp-cli.phar'),
-				'--ssh=' + `docker:${path.basename(config.workDirectoryPath)}-cli-1`,
-				//'@dev',
-				//`db query '${q}'`,
-				'post list',
-				//'--info',
-				'--skip-themes',
-				//`--url=${new URL(u).origin}`
-				// '--format=json'
-				//'--skip-column-names',
-				//'post list path=/nas/content/live/cawebdev/ --http=https://dev.sites.ca.gov --url=https://dev.sites.ca.gov',
-			], 
-			config
-		)*/
+			
+	console.log( 'out', result.stdout.toString() );
+	console.log( 'err', result.stderr.toString() );
 		
-		//console.log( 'Result', result.toString() );
-		//console.log( 'Output', result.stdout.toString() );
-		//console.log( 'Error', result.stderr.toString() );
 };

package/configs/webpack.config.js

@@ -85,7 +85,7 @@ let webpackConfig = {
   devtool: false,
   output: {
     ...baseConfig.output,
-    publicPath: `/`,
+    publicPath: `./`,
     clean: false
   },
   plugins: [

package/lib/cli.js

@@ -259,17 +259,20 @@ export default function cli() {
 		.description('Sync changes from one destination to another.')
 		.argument('<from>', 'Target Site URL with current changes.')
 		.argument('<to>', 'Destination Site URL that should be synced.')
+		.addOption(new Option(
+			'-t,--tax [tax...]',
+			'Taxonomy that should be synced. Omitting this option will sync the full site.'
+		).choices(['pages', 'posts', 'media', 'menus']))
 		.allowUnknownOption(true)
 		.action( withSpinner(env.sync) )
 		
 	// Test Command.
 	// Ensure this is commented out.
-	/*program.command('test')
+	program.command('test')
 		.description('Test commands on a WordPress environment')
 		//.addArgument(envArg)
 		.allowUnknownOption(true)
 		.action(withSpinner(env.test))
-	*/
 	
 	addWPEnvCommands();
 

package/lib/spinner.js

@@ -61,15 +61,19 @@ const withSpinner =
 				){
 
 					let { data, status } = error.response;
-					
+					let msg = data.message || 'An unknown error occurred.';
+
 					if( 401 === status ){
-						data.message +=  `\nPlease check your ${terminalLink('Application Password', 'https://make.wordpress.org/core/2020/11/05/application-passwords-integration-guide/')}`;
+						msg +=  `\nPlease check your ${terminalLink('Application Password', 'https://make.wordpress.org/core/2020/11/05/application-passwords-integration-guide/')}`;
+					} else if( 403 === status ){
+						msg =  'Forbidden Request: A potentially unsafe operation has been detected in your request to this site';
 					}
 
-					spinner.fail( data.message )
+					spinner.fail( msg )
 					process.exit( 1 );
 					
 
+
 				}else if( error ){
 					// Error is an unknown error. That means there was a bug in our code.
 					spinner.fail(

package/lib/wordpress/api.js

@@ -174,7 +174,7 @@ async function createTaxonomies( taxData, request, tax = 'pages', spinner ){
         let url = `${request.url}${endpoint}/${tax}`;
         let existingID = false;
 
-        // in order to maintain ID's, we have to use the cli, the REST API doesn't allow passing the id.
+        // The REST API doesn't allow passing the id, in order to maintain ID's we make an additional request to our plugin endpoint.
         if( obj.id ){
             // first we check if the ID exist
             let idExists = await axios.request(
@@ -203,7 +203,7 @@ async function createTaxonomies( taxData, request, tax = 'pages', spinner ){
             }
 
             /**
-             * if the ID doesn't exist we save it so we can update via CLI later on.
+             * if the ID doesn't exist we save it so we can make a request to our plugin endpoint.
              * if it does exist update endpoint url so we update the existing item.
              */
             if( ! idExists ){
@@ -232,6 +232,7 @@ async function createTaxonomies( taxData, request, tax = 'pages', spinner ){
         // make WordPress REST API request.
         let results = await axios.request({
                 ...request,
+                timeout: 7500,
                 data: 'media' === tax ? createMediaItem(obj) : obj,
                 url
             })
@@ -239,112 +240,22 @@ async function createTaxonomies( taxData, request, tax = 'pages', spinner ){
 
             
         /**
-         * if the obj had an existing ID that didn't exist
+         * if the obj had an existing ID that didn't exist we make a request to our plugin endpoint to update the IDs.
          */
         if( existingID ){
-            let post_tbl = 'wp_posts';
-            let post_meta_tbl = 'wp_postmeta';
-            let term_taxonomy_tbl = 'wp_term_taxonomy';
-            let terms_tbl = 'wp_terms';
-            
-            const cmd = [
-                path.join(projectPath, 'bin', 'wp-cli.phar'),
-                `--ssh=${request.ssh}`,
-                '--skip-themes',
-                `--url=${new URL(request.url).origin}`
-            ];
-            
-            // if taxonomy is page/post/media.
-            if( ['pages', 'posts', 'media'].includes(tax) ){
-
-
-                /**
-                 * Since the REST API doesn't detected trashed posts/pages.
-                 * We have to do a drop before we can do an update.
-                 * Since trashed posts/pages stay in the database
-                 */
-                // drop post
-                /*await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'DELETE FROM ${post_tbl} WHERE ID=${existingID}'`,
-                    ]
-                )
-
-                // drop post meta.
-                await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'DELETE FROM ${post_meta_tbl} WHERE post_id=${existingID}'`,
-                    ]
-                )*/
-
-                // now we can update the new ID with the existing ID.
-                await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'UPDATE ${post_tbl} SET ID=${existingID}  WHERE ID=${results.id}'`,
-                    ]
-                )
-                // update post meta.
-                await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'UPDATE ${post_meta_tbl} SET post_id=${existingID}  WHERE post_id=${results.id}'`,
-                    ]
-                )
-
-            // if taxonomy is menu.
-            }else if( 'menus' === tax ){
-                 // update the terms table.
-                 await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'UPDATE ${terms_tbl} SET term_id=${existingID} WHERE term_id=${results.id}'`,
-                    ]
-                )
 
-                // update the term taxonomy table.
-                await runCmd(
-                    'php',
-                    [
-                        ...cmd,
-                        '--skip-column-names',
-                        `db query 'UPDATE ${term_taxonomy_tbl} SET term_taxonomy_id=${existingID},term_id=${existingID} WHERE term_id=${results.id}'`,
-                    ]
-                )
-
-                /**
-                 * Menus are also stored under nav_menu_locations in the the option theme_mods_<theme_name>
-                 * for each location we patch that nav_menu_locations key with the correct ID
-                 * 
-                 * @todo remove hardcoding of theme name
-                 */
-                results.locations.map( async (location) => {
-                    await runCmd(
-                        'php',
-                        [
-                            ...cmd,
-                            'option patch update',
-                            `theme_mods_CAWeb`,  
-                            'nav_menu_locations',
-                            location,
-                            existingID
-                        ]
-                    )
-                })
-                
-            }
+            await axios.request({
+                ...request,
+                url: `${request.url}/wp-json/caweb-dev/v1/sync`,
+                timeout: 7500,
+                data: {
+                    id: results.id,
+                    newId: existingID,
+                    tax,
+                    locations: 'menus' === tax ? obj.locations : []
+                }
+            })
+            .then( async (res) => { return res.data; } )
             
             // update the API results ID, back to the existing ID from earlier.
             results.id = existingID;

package/lib/wordpress/index.js

@@ -3,6 +3,7 @@ import { downloadSources } from "./download-sources.js";
 import { configureDivi, isDiviThemeActive } from "./divi.js";
 import { configureWordPress, isMultisite, convertToMultisite, generateHTAccess } from "./wordpress.js";
 import { getTaxonomies, createTaxonomies }  from "./api.js";
+import { CAWEB_OPTIONS, DIVI_OPTIONS } from './options.js';
 
 export {
     activateCAWeb,
@@ -15,5 +16,7 @@ export {
 	convertToMultisite,
 	generateHTAccess,
 	getTaxonomies,
-    createTaxonomies
+    createTaxonomies,
+	CAWEB_OPTIONS,
+	DIVI_OPTIONS
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",