@youcan/app 1.2.0-beta.0 → 1.2.0-beta.2

package/dist/cli/services/dev/workers/abstract-worker.js

@@ -17,7 +17,7 @@ class WorkerLogger extends Writable {
             return false;
         }
         const channel = this.channel === 'stdout' ? stdout : stderr;
-        const time = dayjs().format('HH:mm:SSS');
+        const time = dayjs().format('HH:mm:ss:SSS');
         const lines = chunk.toString().split('\n').map(s => s.trim()).filter(s => s !== '');
         for (let i = 0; i < lines.length; i++) {
             i === 0

package/dist/cli/services/dev/workers/app-worker.js

@@ -22,11 +22,10 @@ class AppWorker extends AbstractWorker {
                 stabilityThreshold: 50,
             },
         });
-        watcher.on('change', async () => {
-            watcher.close();
+        watcher.once('change', async () => {
+            await watcher.close();
             this.command.controller.abort();
             this.logger.write('config update detected, reloading workers...');
-            this.command.output.wait(2000);
             this.command.config.runCommand(this.command.id, this.command.argv);
         });
     }

package/dist/cli/services/dev/workers/theme-extension-worker.d.ts

@@ -6,9 +6,10 @@ export default class ThemeExtensionWorker extends AbstractWorker {
     private app;
     private extension;
     private logger;
+    private queue;
     FILE_TYPES: string[];
     constructor(command: Cli.Command, app: App, extension: Extension);
     boot(): Promise<void>;
     run(): Promise<void>;
-    private file;
+    private enqueue;
 }

package/dist/cli/services/dev/workers/theme-extension-worker.js

@@ -1,4 +1,4 @@
-import { Color, Session, Http, Env, Path, Filesystem, Crypto, Form } from '@youcan/cli-kit';
+import { Color, Session, Http, Env, Path, Filesystem, Form } from '@youcan/cli-kit';
 import AbstractWorker, { WorkerLogger } from './abstract-worker.js';
 
 class ThemeExtensionWorker extends AbstractWorker {
@@ -6,6 +6,7 @@ class ThemeExtensionWorker extends AbstractWorker {
     app;
     extension;
     logger;
+    queue = [];
     FILE_TYPES = [
         'assets',
         'locales',
@@ -38,18 +39,17 @@ class ThemeExtensionWorker extends AbstractWorker {
         for (const type of this.FILE_TYPES) {
             const descriptors = this.extension.metadata[type] ?? [];
             const directory = Path.resolve(this.extension.root, type);
-            const present = await Filesystem.readdir(Path.resolve(directory));
+            const present = await Filesystem.exists(directory)
+                ? await Filesystem.readdir(directory)
+                : [];
             present.filter(f => !descriptors.find(d => d.file_name === f))
-                .forEach(async (file) => await this.file('put', type, file));
+                .forEach(async (file) => this.enqueue('put', type, file));
             descriptors.forEach(async (descriptor) => {
                 const path = Path.resolve(directory, descriptor.file_name);
                 if (!(await Filesystem.exists(path))) {
-                    return await this.file('del', type, descriptor.file_name);
-                }
-                const buff = await Filesystem.readFile(path);
-                if (Crypto.sha1(buff) !== descriptor.hash) {
-                    await this.file('put', type, descriptor.file_name);
+                    return this.enqueue('del', type, descriptor.file_name);
                 }
+                this.enqueue('put', type, descriptor.file_name);
             });
         }
         const paths = this.FILE_TYPES
@@ -76,10 +76,10 @@ class ThemeExtensionWorker extends AbstractWorker {
                 switch (event) {
                     case 'add':
                     case 'change':
-                        await this.file('put', filetype, filename);
+                        this.enqueue('put', filetype, filename);
                         break;
                     case 'unlink':
-                        await this.file('del', filetype, filename);
+                        this.enqueue('del', filetype, filename);
                         break;
                 }
             }
@@ -87,17 +87,27 @@ class ThemeExtensionWorker extends AbstractWorker {
                 this.command.output.warn(err);
             }
         });
+        // quick racing conditions hack
+        setInterval(async () => {
+            const task = this.queue.shift();
+            if (task == null) {
+                return;
+            }
+            await task();
+        }, 10);
     }
-    async file(op, type, name) {
-        const path = Path.resolve(this.extension.root, type, name);
-        this.logger.write(`- ${Path.join(type, name)}`);
-        return await Http.post(`${Env.apiHostname()}/apps/draft/${this.app.config.id}/extensions/${this.extension.id}/file`, {
-            body: Form.convert({
-                file_name: name,
-                file_type: type,
-                file_operation: op,
-                file_content: await Form.file(path),
-            }),
+    enqueue(op, type, name) {
+        this.queue.push(async () => {
+            const path = Path.resolve(this.extension.root, type, name);
+            await Http.post(`${Env.apiHostname()}/apps/draft/${this.app.config.id}/extensions/${this.extension.id}/file`, {
+                body: Form.convert({
+                    file_name: name,
+                    file_type: type,
+                    file_operation: op,
+                    file_content: await Form.file(path),
+                }),
+            });
+            this.logger.write(`[${op === 'put' ? 'updated' : 'deleted'}] - ${Path.join(type, name)}`);
         });
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/app",
   "type": "module",
-  "version": "1.2.0-beta.0",
+  "version": "1.2.0-beta.2",
   "description": "OCLIF plugin for building apps",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "license": "MIT",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@oclif/core": "^2.15.0",
     "dayjs": "^1.11.10",
-    "@youcan/cli-kit": "1.2.0-beta.0"
+    "@youcan/cli-kit": "1.2.0-beta.2"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",