@learnpack/learnpack 5.0.340 → 5.0.342

package/lib/lua/redo.lua

@@ -0,0 +1,48 @@
+-- Lua script to redo the last undone change
+-- Implements Memento pattern with optimistic locking
+--
+-- KEYS[1]: undo:{course}:{exercise}:{lang}
+-- KEYS[2]: redo:{course}:{exercise}:{lang}
+-- KEYS[3]: undo:{course}:{exercise}:{lang}:version
+-- ARGV[1]: current_state_json (state before redo, to save in undo)
+-- ARGV[2]: version_id (current client version for optimistic locking)
+-- ARGV[3]: ttl (432000 seconds = 5 days)
+
+-- Get current version
+local current_version = redis.call('GET', KEYS[3])
+
+-- Verify version (optimistic locking)
+if current_version ~= false and current_version ~= ARGV[2] then
+    return {err = 'VERSION_CONFLICT'}
+end
+
+-- Verify there are states to redo
+local redo_length = redis.call('LLEN', KEYS[2])
+if redo_length == 0 then
+    return {err = 'NO_REDO_AVAILABLE'}
+end
+
+-- Get future state (the most recent in redo stack)
+local future_state = redis.call('LPOP', KEYS[2])
+
+if not future_state then
+    return {err = 'NO_FUTURE_STATE'}
+end
+
+-- Save current state in undo stack
+redis.call('LPUSH', KEYS[1], ARGV[1])
+
+-- Maintain state limit in undo (last 5)
+redis.call('LTRIM', KEYS[1], 0, 4)
+
+-- Renew TTL of both stacks
+redis.call('EXPIRE', KEYS[1], tonumber(ARGV[3]))
+redis.call('EXPIRE', KEYS[2], tonumber(ARGV[3]))
+
+-- Increment version and renew its TTL
+local new_version = redis.call('INCR', KEYS[3])
+redis.call('EXPIRE', KEYS[3], tonumber(ARGV[3]))
+
+-- Return array [newVersion, futureState] for compatibility with Redis client
+return {tostring(new_version), future_state}
+

package/lib/lua/saveState.lua

@@ -0,0 +1,40 @@
+-- Lua script to save a new state in history
+-- Implements Memento pattern with optimistic locking
+-- NOTE: We save the state BEFORE changes, so users can undo to it
+--
+-- KEYS[1]: undo:{course}:{exercise}:{lang}
+-- KEYS[2]: redo:{course}:{exercise}:{lang}
+-- KEYS[3]: undo:{course}:{exercise}:{lang}:version
+-- ARGV[1]: state_json (complete README BEFORE changes - serialized)
+-- ARGV[2]: version_id (current client version for optimistic locking)
+-- ARGV[3]: ttl (432000 seconds = 5 days)
+-- ARGV[4]: limit (5 states maximum)
+
+-- Get current version
+local current_version = redis.call('GET', KEYS[3])
+
+-- Verify version (optimistic locking)
+-- If the sent version doesn't match the current one, reject
+if current_version ~= false and current_version ~= ARGV[2] then
+    return {err = 'VERSION_CONFLICT'}
+end
+
+-- Save new state in undo stack (at the beginning)
+redis.call('LPUSH', KEYS[1], ARGV[1])
+
+-- Invalidate redo stack (new change invalidates the "alternative future")
+redis.call('DEL', KEYS[2])
+
+-- Keep only the last N states (0 to limit-1)
+redis.call('LTRIM', KEYS[1], 0, tonumber(ARGV[4]) - 1)
+
+-- Renew TTL of undo stack
+redis.call('EXPIRE', KEYS[1], tonumber(ARGV[3]))
+
+-- Increment version and renew its TTL
+local new_version = redis.call('INCR', KEYS[3])
+redis.call('EXPIRE', KEYS[3], tonumber(ARGV[3]))
+
+-- Return new version (as string for compatibility with Redis client)
+return tostring(new_version)
+

package/lib/lua/undo.lua

@@ -0,0 +1,50 @@
+-- Lua script to undo the last change
+-- Implements Memento pattern with optimistic locking
+-- NOTE: Stack contains states BEFORE changes, so index 0 is what we want to restore
+--
+-- KEYS[1]: undo:{course}:{exercise}:{lang}
+-- KEYS[2]: redo:{course}:{exercise}:{lang}
+-- KEYS[3]: undo:{course}:{exercise}:{lang}:version
+-- ARGV[1]: current_state_json (current state to save in redo for potential redo)
+-- ARGV[2]: version_id (current client version for optimistic locking)
+-- ARGV[3]: ttl (432000 seconds = 5 days)
+
+-- Get current version
+local current_version = redis.call('GET', KEYS[3])
+
+-- Verify version (optimistic locking)
+if current_version ~= false and current_version ~= ARGV[2] then
+    return {err = 'VERSION_CONFLICT'}
+end
+
+-- Verify there are states to undo
+-- We need at least 1 element (the state before the current change)
+local undo_length = redis.call('LLEN', KEYS[1])
+if undo_length < 1 then
+    return {err = 'NO_UNDO_AVAILABLE'}
+end
+
+-- Get the saved state (index 0 - the state before current changes)
+local previous_state = redis.call('LINDEX', KEYS[1], 0)
+
+if not previous_state then
+    return {err = 'NO_PREVIOUS_STATE'}
+end
+
+-- Move current state to redo stack
+redis.call('LPUSH', KEYS[2], ARGV[1])
+
+-- Remove current state from undo stack (index 0)
+redis.call('LPOP', KEYS[1])
+
+-- Renew TTL of both stacks
+redis.call('EXPIRE', KEYS[1], tonumber(ARGV[3]))
+redis.call('EXPIRE', KEYS[2], tonumber(ARGV[3]))
+
+-- Increment version and renew its TTL
+local new_version = redis.call('INCR', KEYS[3])
+redis.call('EXPIRE', KEYS[3], tonumber(ARGV[3]))
+
+-- Return array [newVersion, previousState] for compatibility with Redis client
+return {tostring(new_version), previous_state}
+

package/lib/utils/api.js

@@ -460,8 +460,17 @@ const createRigoPackage = async (token, slug, config) => {
     }
 };
 let technologiesCache = [];
+/** Strip .env comments (e.g. "token # comment") so the token is sent without spaces. */
+function sanitizeToken(token) {
+    if (!token)
+        return "";
+    const trimmed = token.trim();
+    const beforeComment = trimmed.split(/\s+#/)[0].trim();
+    return beforeComment;
+}
 const fetchTechnologies = async () => {
-    const BREATHECODE_PERMANENT_TOKEN = process.env.BREATHECODE_PERMANENT_TOKEN;
+    const rawToken = process.env.BREATHECODE_PERMANENT_TOKEN;
+    const BREATHECODE_PERMANENT_TOKEN = sanitizeToken(rawToken);
     const LANGS = ["en", "es"];
     if (!BREATHECODE_PERMANENT_TOKEN) {
         throw new Error("BREATHECODE_PERMANENT_TOKEN is not defined in environment variables");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.340",
+  "version": "5.0.342",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {
@@ -161,7 +161,7 @@
     ]
   },
   "scripts": {
-    "copy-assets": "npx cpy src/creatorDist/**/* lib/creatorDist --parents --verbose && npx cpy src/utils/templates/**/* lib/utils/templates --parents --verbose",
+    "copy-assets": "npx cpy src/creatorDist/**/* lib/creatorDist --parents --verbose && npx cpy src/utils/templates/**/* lib/utils/templates --parents --verbose && npx cpy src/lua/**/* lib/lua --parents --verbose",
     "tsc": "tsc -b",
     "postpack": "rm -f oclif.manifest.json && eslint . --ext .ts --config .eslintrc",
     "prepack": "rm -rf lib && tsc -b && npm run copy-assets",

package/src/commands/serve.ts

@@ -1184,7 +1184,8 @@ class ServeCommand extends SessionCommand {
       process.env.GCP_BUCKET_NAME || "learnpack-packages"
     )
 
-    const host = process.env.HOST
+    const rawHost = process.env.HOST || ""
+    const host = rawHost.trim().split(/\s+#/)[0].trim()
 
     if (!host) {
       console.log(
@@ -1196,15 +1197,31 @@ class ServeCommand extends SessionCommand {
     }
 
     // Initialize Redis (official client)
-    const redisUrl = process.env.REDIS_URL || "redis://localhost:6379"
+    let redisUrl = (process.env.REDIS_URL || "redis://localhost:6379").trim()
+    // Strip surrounding quotes if present (e.g. from .env)
+    if (
+      (redisUrl.startsWith('"') && redisUrl.endsWith('"')) ||
+      (redisUrl.startsWith("'") && redisUrl.endsWith("'"))
+    ) {
+      redisUrl = redisUrl.slice(1, -1)
+    }
+
+    const isPlaceholderRedisUrl =
+      redisUrl.includes("your_production_password") ||
+      redisUrl.includes("your-redis-instance.cloud")
 
     if (
       process.env.NODE_ENV === "production" &&
-      redisUrl === "redis://localhost:6379"
+      (redisUrl === "redis://localhost:6379" || isPlaceholderRedisUrl)
     ) {
       console.error("❌ REDIS_URL not configured for production environment!")
       console.warn("⚠️  History features will be unavailable")
       this.redis = null
+    } else if (isPlaceholderRedisUrl) {
+      console.warn(
+        "⚠️  REDIS_URL looks like a placeholder; skipping Redis. History features (undo/redo) will be unavailable"
+      )
+      this.redis = null
     } else {
       try {
         const useTLS = redisUrl.startsWith("rediss://")
@@ -1262,7 +1279,9 @@ class ServeCommand extends SessionCommand {
     const server = http.createServer(app)
     initSocketIO(server)
 
-    const PORT = process.env.PORT || 3000
+    const rawPort = process.env.PORT || "3000"
+    const PORT =
+      parseInt(String(rawPort).trim().split(/\s+#/)[0].trim(), 10) || 3000
 
     const distPath = path.resolve(__dirname, "../creatorDist")