@ptkl/toolkit 0.6.0 → 0.6.2

package/dist/commands/apps.js

@@ -77,7 +77,34 @@ class AppsCommand {
         const { apptype, directory, build } = options;
         const profile = util.getCurrentProfile();
         const client = new Api({ token: profile.token, host: profile.host }).app(apptype);
-        return await client.upload(directory, build);
+        try {
+            let buffer = Buffer.alloc(0);
+            const bufferStream = new Writable({
+                write(chunk, encoding, callback) {
+                    buffer = Buffer.concat([buffer, chunk]);
+                    callback();
+                },
+            });
+            // Create tar.gz in memory
+            await new Promise((resolve, reject) => {
+                c({ gzip: true, cwd: directory }, ['.'])
+                    .pipe(bufferStream)
+                    .on('finish', resolve)
+                    .on('error', reject);
+            });
+            console.log('Archive created successfully');
+            // Create FormData with buffer
+            const formData = new FormData();
+            const blob = new Blob([buffer], { type: 'application/gzip' });
+            formData.append('app', blob, 'app.tar.gz');
+            if (build) {
+                formData.append('build', 'true');
+            }
+            return await client.upload(formData);
+        }
+        catch (error) {
+            throw error;
+        }
     }
     async deploy(options) {
         const { apptype, dev_version, public_version, ref } = options;

package/dist/playground.js

@@ -23,7 +23,14 @@ export default class Playground {
         console.log(`Starting playground at ${port}`);
         console.log(`SDK Version: ${this.sdkVersion}`);
         console.log(`Engine: ${this.engine}`);
-        this.watcher = chokidar.watch([], { persistent: true, ignoreInitial: true });
+        // Initialize watcher with better options
+        this.watcher = chokidar.watch([], {
+            persistent: true,
+            ignoreInitial: true,
+            usePolling: false, // Set to true if still having issues on some systems
+            interval: 100,
+            binaryInterval: 300
+        });
         this.srcPath = "";
     }
     async build(files) {
@@ -119,53 +126,72 @@ export default class Playground {
     }
     // Start watching and listen for events
     start() {
+        console.log(`Adding watch path: ${this.srcPath}`);
         this.watcher.add(this.srcPath);
-        this.wss.on("connection", async (ws) => {
-            this.connectedClient = ws;
-            if (this.apptype == 'public-app') {
-                await this.auth(this.connectedClient);
-            }
-            this.initalWsSend(this.connectedClient);
-            console.log("Playground connected");
-        });
-        const handleUpdate = async (filePath) => {
+        // Log watched paths for debugging
+        console.log(`Watched paths:`, this.watcher.getWatched());
+        // Define handlers outside and register them once
+        const handleUpdate = this.debounce(async (filePath) => {
+            console.log("handling update for:", filePath);
             try {
                 const fileData = readFileSync(filePath, "utf-8");
                 const relativeFilePath = relative(this.srcPath, filePath);
                 let dist = await this.build({ [relativeFilePath]: fileData });
                 if (dist) {
-                    this.connectedClient.send(JSON.stringify({ action: "update", dist }));
+                    if (this.connectedClient) {
+                        this.connectedClient.send(JSON.stringify({ action: "update", dist }));
+                    }
+                    else {
+                        console.log("No connected client to send update.");
+                    }
                     console.log(`Updating ${relativeFilePath}`);
                 }
-                this.watcher.on("add", this.debounce(handleUpdate, 300, false));
-                this.watcher.on("change", this.debounce(handleUpdate, 300, false));
-                this.watcher.on("unlink", this.debounce((filePath) => {
-                    const relativeFilePath = relative(this.srcPath, filePath);
-                    this.connectedClient.send(JSON.stringify({ action: "delete", files: [relativeFilePath] }));
-                    console.log(`Deleting ${relativeFilePath}`);
-                }, 300, false));
             }
             catch (err) {
                 console.log(err.message);
             }
-        };
+        }, 300, false);
+        const handleDelete = this.debounce((filePath) => {
+            const relativeFilePath = relative(this.srcPath, filePath);
+            this.connectedClient?.send(JSON.stringify({ action: "delete", files: [relativeFilePath] }));
+            console.log(`Deleting ${relativeFilePath}`);
+        }, 300, false);
+        // Register event listeners once
+        this.watcher.on("add", handleUpdate);
+        this.watcher.on("change", handleUpdate);
+        this.watcher.on("unlink", handleDelete);
+        // Add error handler for watcher
+        this.watcher.on("error", (error) => {
+            console.error("Watcher error:", error);
+        });
+        this.wss.on("connection", async (ws) => {
+            this.connectedClient = ws;
+            if (this.apptype == 'public-app') {
+                await this.auth(this.connectedClient);
+            }
+            this.initalWsSend(this.connectedClient);
+            console.log("Playground connected");
+        });
     }
     close() {
         this.watcher.close();
-        console.log("Watcher closed.");
+        this.wss.close();
+        console.log("Watcher and WebSocket server closed.");
     }
     debounce(func, wait, immediate) {
-        let timeout;
+        let timeout = null;
         return function (...args) {
             const callNow = immediate && !timeout;
-            clearTimeout(timeout);
+            if (timeout) {
+                clearTimeout(timeout);
+            }
             timeout = setTimeout(() => {
                 timeout = null;
                 if (!immediate)
-                    func.apply(null, args);
+                    func.apply(this, args);
             }, wait);
             if (callNow)
-                func.apply(null, args);
+                func.apply(this, args);
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ptkl/toolkit",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "npx tsc",
@@ -13,7 +13,7 @@
   "type": "module",
   "dependencies": {
     "@babel/standalone": "^7.26.10",
-    "@ptkl/sdk": "^0.9.0",
+    "@ptkl/sdk": "^0.9.5",
     "@types/axios": "^0.14.0",
     "@types/commander": "^2.12.2",
     "@types/js-yaml": "^4.0.9",