@ossy/cli 1.17.3 → 1.17.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "1.17.3",
+  "version": "1.17.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ossy-se/packages.git"
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@babel/parser": "^7.28.6",
-    "@ossy/app": "^1.17.3",
-    "@ossy/sdk": "^1.17.3",
+    "@ossy/app": "^1.17.4",
+    "@ossy/sdk": "^1.17.4",
     "arg": "^5.0.2",
     "glob": "^10.3.10"
   },
@@ -33,5 +33,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "f96e3c98e87f9a19b92f7eab0d54e4de12509007"
+  "gitHead": "45251429b7b1f4cdf7f81a5046419905c3c118c9"
 }

package/src/app/publish.js

@@ -101,7 +101,7 @@ export async function publish (options) {
   const remoteDest = parsedArgs['--build-dest']
     ? normaliseLoc(parsedArgs['--build-dest'])
     : domain
-      ? `/sites/${domain}`
+      ? `/@ossy/apps/${domain}`
       : null
 
   if (!remoteDest) {
@@ -134,6 +134,25 @@ export async function publish (options) {
 
   let errors = 0
 
+  // Ensure the full remoteDest path exists (e.g. /sites then /sites/ossy.se)
+  const destSegments = remoteDest.replace(/^\//, '').split('/')
+  for (let i = 0; i < destSegments.length; i++) {
+    const parent = i === 0 ? '/' : '/' + destSegments.slice(0, i).join('/')
+    const name = destSegments[i]
+    try {
+      await sdk.makeRequest(createDir)({ location: parent, name })
+    } catch (err) {
+      const status = err && err.status
+      if (status !== 409 && status !== 422) {
+        logError({
+          message: `[@ossy/cli] app publish: mkdir failed for ${parent}/${name}: ${err?.message ?? err}`,
+        })
+        errors++
+      }
+    }
+  }
+
+  // Create all directories first (sequential; parents must exist before children)
   for (const d of dirs) {
     const rel = d.slice(buildDir.length)
     const parent = normaliseLoc(remoteDest + path.dirname(rel))
@@ -151,7 +170,11 @@ export async function publish (options) {
     }
   }
 
-  for (const f of files) {
+  // Upload files in parallel with a concurrency limit
+  const CONCURRENCY = 10
+  let completed = 0
+
+  async function uploadOne (f) {
     const rel = f.slice(buildDir.length)
     const remoteDir = normaliseLoc(remoteDest + path.dirname(rel))
 
@@ -161,7 +184,7 @@ export async function publish (options) {
     } catch (err) {
       logError({ message: `[@ossy/cli] app publish: cannot read file ${f}: ${err.message}` })
       errors++
-      continue
+      return
     }
 
     let result
@@ -175,14 +198,14 @@ export async function publish (options) {
     } catch (err) {
       logError({ message: `[@ossy/cli] app publish: upload failed for ${f}: ${err?.message ?? err}` })
       errors++
-      continue
+      return
     }
 
     const uploadUrl = result?.content?.uploadUrl
     if (!uploadUrl) {
       logError({ message: `[@ossy/cli] app publish: no uploadUrl in response for ${f}` })
       errors++
-      continue
+      return
     }
 
     try {
@@ -190,9 +213,25 @@ export async function publish (options) {
     } catch (err) {
       logError({ message: `[@ossy/cli] app publish: S3 PUT failed for ${f}: ${err.message}` })
       errors++
+      return
+    }
+
+    completed++
+    if (completed % 50 === 0 || completed === files.length) {
+      logInfo({ message: `[@ossy/cli] app publish: ${completed}/${files.length} files uploaded…` })
     }
   }
 
+  // Run uploadOne over all files with max CONCURRENCY in-flight at once
+  const queue = [...files]
+  const workers = Array.from({ length: Math.min(CONCURRENCY, files.length) }, async () => {
+    while (queue.length > 0) {
+      const f = queue.shift()
+      if (f) await uploadOne(f)
+    }
+  })
+  await Promise.all(workers)
+
   if (errors > 0) {
     logError({
       message: `[@ossy/cli] app publish: done with ${errors} error${errors === 1 ? '' : 's'}`,