@osaas/client-web 0.6.4 → 0.6.6

package/README.md

@@ -16,18 +16,26 @@ npm install --save @osaas/client-web
 
 Example code
 
+Publishing uses `osaas-deploy-manager`'s `/mypages` API (a shared per-tenant
+storage instance with a `*.pages.osaas.io` URL and directory-index support).
+It does not provision a dedicated storage bucket per site, so `web cdn-create`
+/ custom domains cannot be pointed at a published site yet (see
+`Eyevinn/osaas-deploy-manager#1409`):
+
 ```javascript
 import { Context, Log } from '@osaas/client-core';
-import { publish } from '@osaas/client-web';
+import { publishToMyPages } from '@osaas/client-web';
 
 async function main() {
-  const ctx = new Context();
+  const ctx = new Context({ environment });
 
   try {
-    const ctx = new Context({ environment });
-    await publish('www', '/Users/birme/Code/eyevinn/www/dist', ctx, {
-      sync: true
-    });
+    const page = await publishToMyPages(
+      'www',
+      '/Users/birme/Code/eyevinn/www/dist',
+      ctx
+    );
+    console.log(page.url);
   } catch (err) {
     Log().error(err);
   }

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 /** @module @osaas/client-web */
-export { publish } from './publish';
 export { createCloudfrontDistribution } from './cdn';
 export { generateCommonAccessToken, validateCommonAccessToken } from './cat';
+export { publishToMyPages, MyPage, MyPageUploadFile, MyPageUploadTarget, MyPageUploadUrlsResponse, MyPagePublishResult, MyPagesPublishResult, MyPageNotReadyError, validateMyPageName, MAX_PAGE_FILE_SIZE_BYTES, MAX_UPLOAD_FILES_PER_REQUEST } from './mypage';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,4BAA4B,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAC7E,OAAO,EACL,gBAAgB,EAChB,MAAM,EACN,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,EAC7B,MAAM,UAAU,CAAC"}

package/lib/index.js

@@ -1,12 +1,16 @@
 "use strict";
 /** @module @osaas/client-web */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateCommonAccessToken = exports.generateCommonAccessToken = exports.createCloudfrontDistribution = exports.publish = void 0;
-var publish_1 = require("./publish");
-Object.defineProperty(exports, "publish", { enumerable: true, get: function () { return publish_1.publish; } });
+exports.MAX_UPLOAD_FILES_PER_REQUEST = exports.MAX_PAGE_FILE_SIZE_BYTES = exports.validateMyPageName = exports.MyPageNotReadyError = exports.publishToMyPages = exports.validateCommonAccessToken = exports.generateCommonAccessToken = exports.createCloudfrontDistribution = void 0;
 var cdn_1 = require("./cdn");
 Object.defineProperty(exports, "createCloudfrontDistribution", { enumerable: true, get: function () { return cdn_1.createCloudfrontDistribution; } });
 var cat_1 = require("./cat");
 Object.defineProperty(exports, "generateCommonAccessToken", { enumerable: true, get: function () { return cat_1.generateCommonAccessToken; } });
 Object.defineProperty(exports, "validateCommonAccessToken", { enumerable: true, get: function () { return cat_1.validateCommonAccessToken; } });
+var mypage_1 = require("./mypage");
+Object.defineProperty(exports, "publishToMyPages", { enumerable: true, get: function () { return mypage_1.publishToMyPages; } });
+Object.defineProperty(exports, "MyPageNotReadyError", { enumerable: true, get: function () { return mypage_1.MyPageNotReadyError; } });
+Object.defineProperty(exports, "validateMyPageName", { enumerable: true, get: function () { return mypage_1.validateMyPageName; } });
+Object.defineProperty(exports, "MAX_PAGE_FILE_SIZE_BYTES", { enumerable: true, get: function () { return mypage_1.MAX_PAGE_FILE_SIZE_BYTES; } });
+Object.defineProperty(exports, "MAX_UPLOAD_FILES_PER_REQUEST", { enumerable: true, get: function () { return mypage_1.MAX_UPLOAD_FILES_PER_REQUEST; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,gCAAgC;;;AAEhC,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAChB,6BAAqD;AAA5C,mHAAA,4BAA4B,OAAA;AACrC,6BAA6E;AAApE,gHAAA,yBAAyB,OAAA;AAAE,gHAAA,yBAAyB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,gCAAgC;;;AAEhC,6BAAqD;AAA5C,mHAAA,4BAA4B,OAAA;AACrC,6BAA6E;AAApE,gHAAA,yBAAyB,OAAA;AAAE,gHAAA,yBAAyB,OAAA;AAC7D,mCAYkB;AAXhB,0GAAA,gBAAgB,OAAA;AAOhB,6GAAA,mBAAmB,OAAA;AACnB,4GAAA,kBAAkB,OAAA;AAClB,kHAAA,wBAAwB,OAAA;AACxB,sHAAA,4BAA4B,OAAA"}

package/lib/mypage.d.ts

@@ -0,0 +1,96 @@
+import { Context, FetchError } from '@osaas/client-core';
+/**
+ * Per-file size cap and per-request file count cap for `osaas-deploy-manager`'s
+ * `/mypages` API, mirrored from `MAX_PAGE_FILE_SIZE_BYTES` /
+ * `MAX_UPLOAD_FILES_PER_REQUEST` in `Eyevinn/osaas-deploy-manager`'s
+ * `src/apps/mypage.ts` (verified against `main`). These are not re-exported by
+ * that service, so the values are duplicated here — if the upstream service
+ * ever changes them, requests will simply get a 400/413 from the server, which
+ * is a safe failure mode.
+ */
+export declare const MAX_PAGE_FILE_SIZE_BYTES = 26214400;
+export declare const MAX_UPLOAD_FILES_PER_REQUEST = 500;
+/** Server-side cap on the `files` manifest passed to `/mypages/:id/publish`. */
+export declare const MAX_PAGE_MANIFEST_FILES = 5000;
+export interface MyPage {
+    id: string;
+    name: string;
+    url: string;
+    status: 'draft' | 'live';
+}
+export interface MyPageUploadFile {
+    path: string;
+    size: number;
+}
+export interface MyPageUploadTarget {
+    path: string;
+    url: string;
+    method: 'POST';
+    contentType: string;
+    fields: Record<string, string>;
+}
+export interface MyPageUploadUrlsResponse {
+    uploads: MyPageUploadTarget[];
+    expiresAt: string;
+    maxFileSizeBytes: number;
+}
+export interface MyPagePublishResult extends MyPage {
+    prunedCount?: number;
+}
+/** Thrown when the server responds 503 because the tenant's `mypages` MinIO
+ * instance is still starting up. Carries the `Retry-After` value (seconds)
+ * so callers can back off accordingly. */
+export declare class MyPageNotReadyError extends FetchError {
+    retryAfterSeconds: number;
+    constructor(message: string, retryAfterSeconds: number);
+}
+/**
+ * Lightweight client-side pre-check mirroring
+ * `validatePageName`/`PAGE_NAME_CHARSET_RE` in
+ * `Eyevinn/osaas-deploy-manager`'s `src/apps/mypage.ts`. This exists to fail
+ * fast with a clear message before any network call — the server remains the
+ * authoritative validator and will still reject an invalid name with a 400.
+ */
+export declare function validateMyPageName(name: string): string | undefined;
+/**
+ * Create a new My Page site.
+ *
+ * Retries on 503 (the tenant's dedicated `mypages` MinIO instance is still
+ * starting up) using the server's `Retry-After` header, up to a total wait
+ * of ~60s. Throws immediately (no retry) on 409 name-collision.
+ */
+export declare function createMyPage(name: string, ctx: Context): Promise<MyPage>;
+/**
+ * Mint presigned S3 POST upload targets for a batch of files. `files` must
+ * contain at most `MAX_UPLOAD_FILES_PER_REQUEST` entries — chunk larger
+ * manifests before calling this.
+ */
+export declare function getPageUploadUrls(id: string, files: MyPageUploadFile[], ctx: Context): Promise<MyPageUploadUrlsResponse>;
+/**
+ * Finalize a publish: server-side copies each `dir/index.html` to `dir/` so
+ * directory URLs resolve, marks the site `live`, and (since `prune: true` is
+ * always sent here with the complete file manifest) deletes any bucket
+ * object that is not part of the current publish.
+ */
+export declare function finalizeMyPagePublish(id: string, files: string[], ctx: Context): Promise<MyPagePublishResult>;
+/**
+ * Upload a single file to a presigned S3 POST target. Builds a multipart
+ * form from `target.fields` (appended in order, untouched) with the file
+ * appended last under the field name `file`, read as a stream — never
+ * base64-encoded or buffered into memory.
+ */
+export declare function uploadFileToPresignedTarget(filePath: string, target: MyPageUploadTarget): Promise<void>;
+export interface MyPagesPublishResult {
+    id: string;
+    name: string;
+    url: string;
+}
+/**
+ * Publish a directory of static files as a My Page site via
+ * `osaas-deploy-manager`'s `/mypages` API: create the site, mint presigned
+ * upload targets in batches of at most `MAX_UPLOAD_FILES_PER_REQUEST`, POST
+ * every file directly to its presigned target, then finalize the publish
+ * with the complete file manifest and `prune: true`.
+ */
+export declare function publishToMyPages(name: string, dir: string, ctx: Context): Promise<MyPagesPublishResult>;
+//# sourceMappingURL=mypage.d.ts.map

package/lib/mypage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mypage.d.ts","sourceRoot":"","sources":["../src/mypage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAe,MAAM,oBAAoB,CAAC;AAKtE;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,WAAW,CAAC;AACjD,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAChD,gFAAgF;AAChF,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAS5C,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;0CAE0C;AAC1C,qBAAa,mBAAoB,SAAQ,UAAU;IACjD,iBAAiB,EAAE,MAAM,CAAC;gBAEd,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM;CAIvD;AAgDD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQnE;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAED;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,gBAAgB,EAAE,EACzB,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,wBAAwB,CAAC,CAWnC;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,mBAAmB,CAAC,CAW9B;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,IAAI,CAAC,CAkDf;AAqBD,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,oBAAoB,CAAC,CAuD/B"}

package/lib/mypage.js

@@ -0,0 +1,261 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishToMyPages = exports.uploadFileToPresignedTarget = exports.finalizeMyPagePublish = exports.getPageUploadUrls = exports.createMyPage = exports.validateMyPageName = exports.MyPageNotReadyError = exports.MAX_PAGE_MANIFEST_FILES = exports.MAX_UPLOAD_FILES_PER_REQUEST = exports.MAX_PAGE_FILE_SIZE_BYTES = void 0;
+const client_core_1 = require("@osaas/client-core");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const form_data_1 = __importDefault(require("form-data"));
+/**
+ * Per-file size cap and per-request file count cap for `osaas-deploy-manager`'s
+ * `/mypages` API, mirrored from `MAX_PAGE_FILE_SIZE_BYTES` /
+ * `MAX_UPLOAD_FILES_PER_REQUEST` in `Eyevinn/osaas-deploy-manager`'s
+ * `src/apps/mypage.ts` (verified against `main`). These are not re-exported by
+ * that service, so the values are duplicated here — if the upstream service
+ * ever changes them, requests will simply get a 400/413 from the server, which
+ * is a safe failure mode.
+ */
+exports.MAX_PAGE_FILE_SIZE_BYTES = 26214400; // 25 MiB
+exports.MAX_UPLOAD_FILES_PER_REQUEST = 500;
+/** Server-side cap on the `files` manifest passed to `/mypages/:id/publish`. */
+exports.MAX_PAGE_MANIFEST_FILES = 5000;
+/** Total time budget for retrying a 503 "storage still starting up" response. */
+const NOT_READY_RETRY_BUDGET_MS = 60000;
+/** Fallback backoff when the server does not send a usable `Retry-After`. */
+const DEFAULT_RETRY_AFTER_SECONDS = 10;
+const delay = (ms) => new Promise((res) => setTimeout(res, ms));
+/** Thrown when the server responds 503 because the tenant's `mypages` MinIO
+ * instance is still starting up. Carries the `Retry-After` value (seconds)
+ * so callers can back off accordingly. */
+class MyPageNotReadyError extends client_core_1.FetchError {
+    retryAfterSeconds;
+    constructor(message, retryAfterSeconds) {
+        super({ message, httpCode: 503 });
+        this.retryAfterSeconds = retryAfterSeconds;
+    }
+}
+exports.MyPageNotReadyError = MyPageNotReadyError;
+/**
+ * Error factory for `/mypages*` endpoints. Behaves like the library default
+ * (parses `{ reason }` / `{ message }` JSON bodies, or falls back to raw
+ * text) but additionally turns a 503 into a `MyPageNotReadyError` carrying
+ * the parsed `Retry-After` header, since the shared `createFetch` error path
+ * does not expose response headers to callers.
+ */
+const mypageErrorFactory = async (response) => {
+    let message;
+    if (response.headers.get('content-type')?.includes('application/json')) {
+        const body = (await response.json());
+        message = body?.message ?? body?.reason ?? JSON.stringify(body);
+    }
+    else {
+        message = await response.text();
+    }
+    if (response.status === 503) {
+        const retryAfterHeader = response.headers.get('retry-after');
+        const parsed = retryAfterHeader ? parseInt(retryAfterHeader, 10) : NaN;
+        return new MyPageNotReadyError(message, Number.isFinite(parsed) ? parsed : DEFAULT_RETRY_AFTER_SECONDS);
+    }
+    return new client_core_1.FetchError({ message, httpCode: response.status });
+};
+function myPagesBaseUrl(ctx) {
+    return `https://deploy.svc.${ctx.getEnvironment()}.osaas.io`;
+}
+function jsonHeaders(ctx) {
+    return {
+        'x-pat-jwt': `Bearer ${ctx.getPersonalAccessToken()}`,
+        'Content-Type': 'application/json'
+    };
+}
+const PAGE_NAME_CHARSET_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+/**
+ * Lightweight client-side pre-check mirroring
+ * `validatePageName`/`PAGE_NAME_CHARSET_RE` in
+ * `Eyevinn/osaas-deploy-manager`'s `src/apps/mypage.ts`. This exists to fail
+ * fast with a clear message before any network call — the server remains the
+ * authoritative validator and will still reject an invalid name with a 400.
+ */
+function validateMyPageName(name) {
+    if (name.length < 3 || name.length > 52) {
+        return `Page name must be between 3 and 52 characters (got ${name.length})`;
+    }
+    if (!PAGE_NAME_CHARSET_RE.test(name)) {
+        return 'Page name must be lowercase letters, numbers, and hyphens only, and must start/end with a letter or number';
+    }
+    return undefined;
+}
+exports.validateMyPageName = validateMyPageName;
+/**
+ * Create a new My Page site.
+ *
+ * Retries on 503 (the tenant's dedicated `mypages` MinIO instance is still
+ * starting up) using the server's `Retry-After` header, up to a total wait
+ * of ~60s. Throws immediately (no retry) on 409 name-collision.
+ */
+async function createMyPage(name, ctx) {
+    const url = new URL('/mypages', myPagesBaseUrl(ctx));
+    let waitedMs = 0;
+    for (;;) {
+        try {
+            return await (0, client_core_1.createFetch)(url, {
+                method: 'POST',
+                headers: jsonHeaders(ctx),
+                body: JSON.stringify({ name })
+            }, mypageErrorFactory);
+        }
+        catch (error) {
+            if (error instanceof client_core_1.FetchError && error.httpCode === 409) {
+                throw new Error(`Page name '${name}' is already in use. Choose a different name.`);
+            }
+            if (error instanceof MyPageNotReadyError) {
+                const backoffMs = error.retryAfterSeconds * 1000;
+                if (waitedMs + backoffMs > NOT_READY_RETRY_BUDGET_MS) {
+                    throw new Error(`My Page storage for '${name}' is still starting up after ${Math.round(waitedMs / 1000)}s of retries. Try again in a moment. (${error.message})`);
+                }
+                await delay(backoffMs);
+                waitedMs += backoffMs;
+                continue;
+            }
+            throw error;
+        }
+    }
+}
+exports.createMyPage = createMyPage;
+/**
+ * Mint presigned S3 POST upload targets for a batch of files. `files` must
+ * contain at most `MAX_UPLOAD_FILES_PER_REQUEST` entries — chunk larger
+ * manifests before calling this.
+ */
+async function getPageUploadUrls(id, files, ctx) {
+    const url = new URL(`/mypages/${id}/upload-urls`, myPagesBaseUrl(ctx));
+    return await (0, client_core_1.createFetch)(url, {
+        method: 'POST',
+        headers: jsonHeaders(ctx),
+        body: JSON.stringify({ files })
+    }, mypageErrorFactory);
+}
+exports.getPageUploadUrls = getPageUploadUrls;
+/**
+ * Finalize a publish: server-side copies each `dir/index.html` to `dir/` so
+ * directory URLs resolve, marks the site `live`, and (since `prune: true` is
+ * always sent here with the complete file manifest) deletes any bucket
+ * object that is not part of the current publish.
+ */
+async function finalizeMyPagePublish(id, files, ctx) {
+    const url = new URL(`/mypages/${id}/publish`, myPagesBaseUrl(ctx));
+    return await (0, client_core_1.createFetch)(url, {
+        method: 'POST',
+        headers: jsonHeaders(ctx),
+        body: JSON.stringify({ files, prune: true })
+    }, mypageErrorFactory);
+}
+exports.finalizeMyPagePublish = finalizeMyPagePublish;
+/**
+ * Upload a single file to a presigned S3 POST target. Builds a multipart
+ * form from `target.fields` (appended in order, untouched) with the file
+ * appended last under the field name `file`, read as a stream — never
+ * base64-encoded or buffered into memory.
+ */
+async function uploadFileToPresignedTarget(filePath, target) {
+    const form = new form_data_1.default();
+    for (const [key, value] of Object.entries(target.fields)) {
+        form.append(key, value);
+    }
+    form.append('file', (0, fs_1.createReadStream)(filePath), {
+        filename: (0, path_1.basename)(filePath),
+        contentType: target.contentType
+    });
+    await new Promise((resolve, reject) => {
+        form.submit(target.url, (err, res) => {
+            if (err) {
+                reject(new Error(`Upload of '${target.path}' failed: ${err.message}`));
+                return;
+            }
+            if (!res) {
+                reject(new Error(`Upload of '${target.path}' failed: no response`));
+                return;
+            }
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('error', (streamErr) => reject(new Error(`Upload of '${target.path}' failed: ${streamErr.message}`)));
+            res.on('end', () => {
+                const statusCode = res.statusCode ?? 0;
+                if (statusCode >= 200 && statusCode < 300) {
+                    resolve();
+                }
+                else {
+                    const body = Buffer.concat(chunks).toString('utf8');
+                    reject(new Error(`Upload of '${target.path}' failed with HTTP ${statusCode}: ${body}`));
+                }
+            });
+        });
+    });
+}
+exports.uploadFileToPresignedTarget = uploadFileToPresignedTarget;
+function chunk(items, size) {
+    const chunks = [];
+    for (let i = 0; i < items.length; i += size) {
+        chunks.push(items.slice(i, i + size));
+    }
+    return chunks;
+}
+/** Recursively list every regular file under `dir`, as site-relative paths
+ * using forward slashes (the `/mypages` API rejects backslashes), skipping
+ * `.git`. */
+function listSiteFiles(dir) {
+    const entries = (0, fs_1.readdirSync)(dir, { recursive: true });
+    return entries
+        .filter((entry) => entry.split(path_1.sep)[0] !== '.git')
+        .filter((entry) => !(0, fs_1.statSync)((0, path_1.join)(dir, entry)).isDirectory())
+        .map((entry) => entry.split(path_1.sep).join('/'));
+}
+/**
+ * Publish a directory of static files as a My Page site via
+ * `osaas-deploy-manager`'s `/mypages` API: create the site, mint presigned
+ * upload targets in batches of at most `MAX_UPLOAD_FILES_PER_REQUEST`, POST
+ * every file directly to its presigned target, then finalize the publish
+ * with the complete file manifest and `prune: true`.
+ */
+async function publishToMyPages(name, dir, ctx) {
+    const nameError = validateMyPageName(name);
+    if (nameError) {
+        throw new Error(nameError);
+    }
+    const relativePaths = listSiteFiles(dir);
+    if (relativePaths.length === 0) {
+        throw new Error(`No files found to publish in '${dir}'`);
+    }
+    if (relativePaths.length > exports.MAX_PAGE_MANIFEST_FILES) {
+        throw new Error(`'${dir}' contains ${relativePaths.length} files, which exceeds the ${exports.MAX_PAGE_MANIFEST_FILES}-file limit for a single My Page site`);
+    }
+    const oversized = relativePaths.filter((p) => (0, fs_1.statSync)((0, path_1.join)(dir, p)).size > exports.MAX_PAGE_FILE_SIZE_BYTES);
+    if (oversized.length > 0) {
+        throw new Error(`The following files exceed the ${exports.MAX_PAGE_FILE_SIZE_BYTES}-byte per-file limit: ${oversized.join(', ')}`);
+    }
+    const page = await createMyPage(name, ctx);
+    const fileBatches = chunk(relativePaths, exports.MAX_UPLOAD_FILES_PER_REQUEST);
+    const targetsByPath = new Map();
+    for (const batch of fileBatches) {
+        const files = batch.map((p) => ({
+            path: p,
+            size: (0, fs_1.statSync)((0, path_1.join)(dir, p)).size
+        }));
+        const { uploads } = await getPageUploadUrls(page.id, files, ctx);
+        for (const upload of uploads) {
+            targetsByPath.set(upload.path, upload);
+        }
+    }
+    for (const relativePath of relativePaths) {
+        const target = targetsByPath.get(relativePath);
+        if (!target) {
+            throw new Error(`Server did not return an upload target for '${relativePath}'`);
+        }
+        await uploadFileToPresignedTarget((0, path_1.join)(dir, relativePath), target);
+    }
+    const published = await finalizeMyPagePublish(page.id, relativePaths, ctx);
+    return { id: published.id, name: published.name, url: published.url };
+}
+exports.publishToMyPages = publishToMyPages;
+//# sourceMappingURL=mypage.js.map

package/lib/mypage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mypage.js","sourceRoot":"","sources":["../src/mypage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osaas/client-web",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Open Source Cloud Client SDK web library",
   "author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
   "homepage": "https://www.osaas.io",
@@ -26,14 +26,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-cloudfront": "^3.730.0",
-    "@osaas/client-core": "^0.25.2",
-    "@osaas/client-services": "^0.17.2",
+    "@osaas/client-core": "^0.26.0",
+    "@osaas/client-services": "^0.17.3",
     "chalk": "4.1.2",
+    "form-data": "^4.0.0",
     "mime": "^3.0.0",
     "minio": "^8.0.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "041e105cd610c96789138bea5bec103bc97b4951"
+  "gitHead": "2991b52a67fbbc8c038222dfd0f7a060b0072b8d"
 }

package/lib/bucket.d.ts

@@ -1,11 +0,0 @@
-import { Context } from '@osaas/client-core';
-export interface Bucket {
-    name: string;
-    endpoint: string;
-    accessKeyId: string;
-    secretAccessKey: string;
-}
-export declare function createStorageBucket(name: string, ctx: Context): Promise<Bucket>;
-export declare function removeBucketContents(bucket: Bucket): Promise<void>;
-export declare function uploadFile(source: string, dest: string, bucket: Bucket): Promise<void>;
-//# sourceMappingURL=bucket.d.ts.map

package/lib/bucket.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../src/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,oBAAoB,CAAC;AAa5B,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AA0BD,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,OAAO,GACX,OAAO,CAAC,MAAM,CAAC,CAoCjB;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,iBA6BxD;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAiBf"}

package/lib/bucket.js

@@ -1,133 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadFile = exports.removeBucketContents = exports.createStorageBucket = void 0;
-const client_core_1 = require("@osaas/client-core");
-const client_services_1 = require("@osaas/client-services");
-const crypto_1 = require("crypto");
-const fs_1 = require("fs");
-const Minio = __importStar(require("minio"));
-const mime_1 = __importDefault(require("mime"));
-const delay = (ms) => new Promise((res) => setTimeout(res, ms));
-function createPublicBucketPolicy(name) {
-    return {
-        Statement: [
-            {
-                Action: ['s3:GetBucketLocation', 's3:ListBucket'],
-                Effect: 'Allow',
-                Principal: {
-                    AWS: ['*']
-                },
-                Resource: [`arn:aws:s3:::${name}`]
-            },
-            {
-                Action: ['s3:GetObject'],
-                Effect: 'Allow',
-                Principal: {
-                    AWS: ['*']
-                },
-                Resource: [`arn:aws:s3:::${name}/*`]
-            }
-        ],
-        Version: '2012-10-17'
-    };
-}
-async function createStorageBucket(name, ctx) {
-    const sat = await ctx.getServiceAccessToken('minio-minio');
-    let instance = await (0, client_core_1.getInstance)(ctx, 'minio-minio', name, sat);
-    if (!instance) {
-        const rootPassword = (0, crypto_1.randomBytes)(16).toString('hex');
-        const config = {
-            name,
-            RootUser: 'root',
-            RootPassword: rootPassword
-        };
-        const newInstance = await (0, client_services_1.createMinioMinioInstance)(ctx, config);
-        if (!newInstance) {
-            throw new Error('Failed to create new Minio instance');
-        }
-        instance = newInstance;
-        await (0, client_core_1.waitForInstanceReady)('minio-minio', name, ctx);
-        await delay(2000);
-        const minioClient = new Minio.Client({
-            endPoint: new URL(instance.url).hostname,
-            accessKey: 'root',
-            secretKey: instance.RootPassword || ''
-        });
-        await minioClient.makeBucket(name);
-        await minioClient.setBucketPolicy(name, JSON.stringify(createPublicBucketPolicy(name)));
-    }
-    return {
-        name: instance.name,
-        endpoint: instance.url,
-        accessKeyId: 'root',
-        secretAccessKey: instance.RootPassword || ''
-    };
-}
-exports.createStorageBucket = createStorageBucket;
-async function removeBucketContents(bucket) {
-    (0, client_core_1.Log)().debug(`Removing contents on bucket ${bucket.name}`);
-    const minioClient = new Minio.Client({
-        endPoint: new URL(bucket.endpoint).hostname,
-        accessKey: bucket.accessKeyId,
-        secretKey: bucket.secretAccessKey
-    });
-    const p = new Promise((resolve, reject) => {
-        const stream = minioClient.listObjects(bucket.name, '', true);
-        const objectsToDelete = [];
-        stream.on('data', (obj) => {
-            if (obj.name) {
-                objectsToDelete.push(obj.name);
-            }
-        });
-        stream.on('end', () => {
-            resolve(objectsToDelete);
-        });
-        stream.on('error', (err) => {
-            reject(err);
-        });
-    });
-    const objectsToDelete = await p;
-    (0, client_core_1.Log)().debug(`Deleting ${objectsToDelete.length} objects`);
-    await minioClient.removeObjects(bucket.name, objectsToDelete);
-}
-exports.removeBucketContents = removeBucketContents;
-async function uploadFile(source, dest, bucket) {
-    (0, client_core_1.Log)().debug(`Uploading ${source} to ${bucket.name}/${dest}`);
-    const fileStream = (0, fs_1.createReadStream)(source);
-    const stats = await (0, fs_1.statSync)(source);
-    const metadata = { 'Content-Type': mime_1.default.getType(source) };
-    const minioClient = new Minio.Client({
-        endPoint: new URL(bucket.endpoint).hostname,
-        accessKey: bucket.accessKeyId,
-        secretKey: bucket.secretAccessKey
-    });
-    await minioClient.putObject(bucket.name, dest, fileStream, stats.size, metadata);
-}
-exports.uploadFile = uploadFile;
-//# sourceMappingURL=bucket.js.map

package/lib/bucket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../src/bucket.ts"],"names":[],"mappings":"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"}

package/lib/publish.d.ts

@@ -1,33 +0,0 @@
-import { Context } from '@osaas/client-core';
-import { Bucket } from './bucket';
-export interface PublishOpts {
-    sync?: boolean;
-}
-export interface Website {
-    name: string;
-    url: string;
-    bucket: Bucket;
-}
-/**
- * Publish options
- * @typedef PublishOpts
- * @type object
- * @property {boolean} [sync] - If true, clear bucket before uploading new files
- */
-/**
- * Publish a static website using Eyevinn Open Source Cloud Storage
- *
- * @memberof module:@osaas/client-web
- * @async
- * @param name - Name of the website
- * @param dir - Directory to publish
- * @param ctx - Open Source Cloud configuration context
- * @param {PublishOpts} [opts] - Publish options
- * @returns name and url of the published website
- */
-export declare function publish(name: string, dir: string, ctx: Context, opts?: PublishOpts): Promise<{
-    name: string;
-    url: string;
-    bucket: Bucket;
-}>;
-//# sourceMappingURL=publish.d.ts.map

package/lib/publish.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAuB,MAAM,oBAAoB,CAAC;AAClE,OAAO,EACL,MAAM,EAIP,MAAM,UAAU,CAAC;AAKlB,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,OAAO,EACZ,IAAI,CAAC,EAAE,WAAW;;;;GAuBnB"}

package/lib/publish.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.publish = void 0;
-const client_core_1 = require("@osaas/client-core");
-const bucket_1 = require("./bucket");
-const promises_1 = require("fs/promises");
-const path_1 = require("path");
-const fs_1 = require("fs");
-/**
- * Publish options
- * @typedef PublishOpts
- * @type object
- * @property {boolean} [sync] - If true, clear bucket before uploading new files
- */
-/**
- * Publish a static website using Eyevinn Open Source Cloud Storage
- *
- * @memberof module:@osaas/client-web
- * @async
- * @param name - Name of the website
- * @param dir - Directory to publish
- * @param ctx - Open Source Cloud configuration context
- * @param {PublishOpts} [opts] - Publish options
- * @returns name and url of the published website
- */
-async function publish(name, dir, ctx, opts) {
-    if (!(0, client_core_1.isValidInstanceName)(name)) {
-        throw new Error(`Invalid website identifier (lowercase letters and numbers allowed): ${name}`);
-    }
-    const sync = opts?.sync || false;
-    const bucket = await (0, bucket_1.createStorageBucket)(name, ctx);
-    if (sync) {
-        await (0, bucket_1.removeBucketContents)(bucket);
-    }
-    const files = await (0, promises_1.readdir)(dir, { recursive: true });
-    for (const file of files.filter((f) => f !== '.git')) {
-        if (!(0, fs_1.statSync)((0, path_1.join)(dir, file)).isDirectory()) {
-            await (0, bucket_1.uploadFile)((0, path_1.join)(dir, file), file, bucket);
-        }
-    }
-    return {
-        name,
-        url: bucket.endpoint + '/' + bucket.name + '/index.html',
-        bucket
-    };
-}
-exports.publish = publish;
-//# sourceMappingURL=publish.js.map

package/lib/publish.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":";;;AAAA,oDAAkE;AAClE,qCAKkB;AAClB,0CAAsC;AACtC,+BAA4B;AAC5B,2BAA8B;AAY9B;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACI,KAAK,UAAU,OAAO,CAC3B,IAAY,EACZ,GAAW,EACX,GAAY,EACZ,IAAkB;IAElB,IAAI,CAAC,IAAA,iCAAmB,EAAC,IAAI,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CACb,uEAAuE,IAAI,EAAE,CAC9E,CAAC;KACH;IACD,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,KAAK,CAAC;IACjC,MAAM,MAAM,GAAG,MAAM,IAAA,4BAAmB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpD,IAAI,IAAI,EAAE;QACR,MAAM,IAAA,6BAAoB,EAAC,MAAM,CAAC,CAAC;KACpC;IACD,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE;QACpD,IAAI,CAAC,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;YAC5C,MAAM,IAAA,mBAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACjD;KACF;IACD,OAAO;QACL,IAAI;QACJ,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,GAAG,aAAa;QACxD,MAAM;KACP,CAAC;AACJ,CAAC;AA3BD,0BA2BC"}