@opra/client 0.4.0 → 0.5.0

package/cjs/client-request.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraClientRequest = void 0;
+const rxjs_1 = require("rxjs");
+const uid_1 = require("uid");
+const common_1 = require("@opra/common");
+class OpraClientRequest extends rxjs_1.Observable {
+    client;
+    _send;
+    options;
+    id;
+    _promise;
+    constructor(client, _send, options = {}) {
+        super((subscriber) => {
+            this.execute().then(v => {
+                subscriber.next(v);
+                subscriber.complete();
+            }).catch(e => subscriber.error(e));
+        });
+        this.client = client;
+        this._send = _send;
+        this.options = options;
+        this.id = (0, uid_1.uid)(10);
+        this.options = options;
+    }
+    async toPromise() {
+        return this.execute();
+    }
+    async execute() {
+        const promise = this._promise || (this._promise = this._execute());
+        return await promise;
+    }
+    async _execute() {
+        const req = this.prepare();
+        const headers = this.options.http?.headers
+            ? new common_1.HeadersMap({ ...req.headers, ...this.options.http.headers }).toObject()
+            : req.headers;
+        return this._send({
+            ...this.options.http,
+            ...req,
+            headers
+        });
+    }
+    binding() {
+        return {};
+    }
+}
+exports.OpraClientRequest = OpraClientRequest;

package/cjs/client.js

@@ -3,93 +3,136 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraClient = void 0;
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
+const power_tasks_1 = require("power-tasks");
 const common_1 = require("@opra/common");
 const schema_1 = require("@opra/schema");
 const url_1 = require("@opra/url");
 const client_error_js_1 = require("./client-error.js");
-const collection_service_js_1 = require("./services/collection-service.js");
-const singleton_service_js_1 = require("./services/singleton-service.js");
+const batch_request_js_1 = require("./requests/batch-request.js");
+const collection_node_js_1 = require("./services/collection-node.js");
+const singleton_node_js_1 = require("./services/singleton-node.js");
+const documentCache = new Map();
+const documentCacheResolvers = new Map();
 class OpraClient {
-    serviceUrl;
-    options;
+    _axios;
     _metadata;
-    constructor(serviceUrl, options) {
-        this.options = { ...options };
-        this.serviceUrl = (0, url_1.normalizePath)(serviceUrl);
+    _taskQueue;
+    constructor(serviceUrl, arg1, arg2) {
+        let options;
+        if (arg1 instanceof schema_1.OpraDocument) {
+            this._metadata = arg1;
+            options = arg2;
+        }
+        else
+            options = arg1 || arg2;
+        this._taskQueue = new power_tasks_1.TaskQueue({
+            maxQueue: options?.maxQueue,
+            concurrency: options?.concurrency
+        });
+        this._axios = axios_1.default.create();
+        this._axios.defaults.baseURL = (0, url_1.normalizePath)(serviceUrl);
+        this._axios.defaults.adapter = options?.adapter;
+        if (options?.defaults?.headers)
+            this._axios.defaults.headers.common = options.defaults.headers;
+        this._axios.defaults.auth = options?.defaults?.auth;
+        this._axios.defaults.timeout = options?.defaults?.timeout;
+        this._axios.defaults.timeoutErrorMessage = options?.defaults?.timeoutErrorMessage;
+        this._axios.defaults.xsrfCookieName = options?.defaults?.xsrfCookieName;
+        this._axios.defaults.xsrfHeaderName = options?.defaults?.xsrfHeaderName;
+        this._axios.defaults.maxRedirects = options?.defaults?.maxRedirects;
+        this._axios.defaults.maxRate = options?.defaults?.maxRate;
+        this._axios.defaults.httpAgent = options?.defaults?.httpAgent;
+        this._axios.defaults.httpsAgent = options?.defaults?.httpsAgent;
+        this._axios.defaults.proxy = options?.defaults?.proxy;
+        this._axios.defaults.validateStatus = options?.defaults?.validateStatus;
+        const document = documentCache.get(serviceUrl.toLowerCase());
+        if (document)
+            this._metadata = document;
+    }
+    get requestInterceptors() {
+        return this._axios.interceptors.request;
+    }
+    get responseInterceptors() {
+        return this._axios.interceptors.response;
+    }
+    get serviceUrl() {
+        return this._axios.defaults.baseURL || '';
+    }
+    get initialized() {
+        return !!this._metadata;
     }
     get metadata() {
+        this._assertMetadata();
         return this._metadata;
     }
-    collection(name, options) {
+    async init() {
+        let promise = documentCacheResolvers.get(this.serviceUrl.toLowerCase());
+        if (promise) {
+            await promise;
+            return;
+        }
+        promise = this._send({
+            method: 'GET',
+            url: '/$metadata',
+        });
+        documentCacheResolvers.set(this.serviceUrl.toLowerCase(), promise);
+        try {
+            const resp = await promise;
+            this._metadata = new schema_1.OpraDocument(resp.data);
+        }
+        finally {
+            documentCacheResolvers.delete(this.serviceUrl.toLowerCase());
+        }
+    }
+    batch(requests) {
+        this._assertMetadata();
+        return new batch_request_js_1.BatchRequest(this, requests, req => this._send(req));
+    }
+    collection(name) {
+        this._assertMetadata();
         const resource = this.metadata.getCollectionResource(name);
-        const commonOptions = {
-            headers: this.options.defaultHeaders,
-            validateStatus: this.options.validateStatus,
-            ...options,
-        };
-        return new collection_service_js_1.CollectionService(this.serviceUrl, this.metadata, (req) => this._send(req, commonOptions), resource);
+        return new collection_node_js_1.CollectionNode(this, resource, req => this._send(req));
     }
-    singleton(name, options) {
+    singleton(name) {
+        this._assertMetadata();
         const resource = this.metadata.getSingletonResource(name);
-        const commonOptions = {
-            headers: this.options.defaultHeaders,
-            validateStatus: this.options.validateStatus,
-            ...options,
-        };
-        return new singleton_service_js_1.SingletonService(this.serviceUrl, this.metadata, (req) => this._send(req, commonOptions), resource);
+        return new singleton_node_js_1.SingletonNode(this, resource, req => this._send(req));
     }
-    async _send(req, options) {
-        const axiosInstance = this._createAxiosInstance(options);
-        const resp = await axiosInstance.request({ ...req, validateStatus: undefined });
-        const validateStatus = options?.validateStatus;
-        if ((validateStatus === true && !(resp.status >= 200 && resp.status < 300)) ||
-            (typeof validateStatus === 'function' && !validateStatus(resp.status))) {
-            throw new client_error_js_1.ClientError({
-                message: resp.statusText,
-                status: resp.status,
-                issues: resp.data.errors
+    async _send(req) {
+        return this._taskQueue.enqueue(async () => {
+            const resp = await this._axios.request({
+                ...req,
+                validateStatus: () => true
             });
-        }
-        const rawHeaders = (typeof resp.headers.toJSON === 'function'
-            ? resp.headers.toJSON()
-            : { ...resp.headers });
-        const headers = new common_1.ResponsiveMap(rawHeaders);
-        return {
-            status: resp.status,
-            statusText: resp.statusText,
-            data: resp.data,
-            rawHeaders,
-            headers
-        };
-    }
-    _createAxiosInstance(options) {
-        const axiosInstance = axios_1.default.create();
-        axiosInstance.defaults.adapter = this.options.adapter;
-        axiosInstance.defaults.headers.common = { ...options?.headers, ...this.options.defaultHeaders };
-        if (options?.validateStatus != null) {
-            if (options.validateStatus === false)
-                axiosInstance.defaults.validateStatus = () => true;
-            else if (typeof options.validateStatus === 'function')
-                axiosInstance.defaults.validateStatus = options.validateStatus;
-        }
-        else if (this.options.validateStatus != null) {
-            if (this.options.validateStatus === false)
-                axiosInstance.defaults.validateStatus = () => true;
-            else if (typeof this.options.validateStatus === 'function')
-                axiosInstance.defaults.validateStatus = this.options.validateStatus;
-        }
-        return axiosInstance;
+            if ((resp.status >= 400 && resp.status < 600) &&
+                (this._axios.defaults.validateStatus && !this._axios.defaults.validateStatus(resp.status))) {
+                throw new client_error_js_1.ClientError({
+                    message: resp.status + ' ' + resp.statusText,
+                    status: resp.status,
+                    issues: resp.data.errors
+                });
+            }
+            const rawHeaders = (typeof resp.headers.toJSON === 'function'
+                ? resp.headers.toJSON()
+                : { ...resp.headers });
+            const headers = new common_1.ResponsiveMap(rawHeaders);
+            return {
+                status: resp.status,
+                statusText: resp.statusText,
+                data: resp.data,
+                rawHeaders,
+                headers
+            };
+        }).toPromise();
     }
-    async _fetchMetadata() {
-        const resp = await this._send({
-            method: 'GET',
-            url: (0, url_1.joinPath)(this.serviceUrl || '/', '$metadata'),
-        }, { validateStatus: true });
-        this._metadata = new schema_1.OpraDocument(resp.data);
+    _assertMetadata() {
+        if (!this._metadata)
+            throw new Error('You must call init() to before using the client instance');
     }
     static async create(serviceUrl, options) {
         const client = new this(serviceUrl, options);
-        await client._fetchMetadata();
+        if (!client._metadata)
+            await client.init();
         return client;
     }
 }

package/cjs/index.js

@@ -2,7 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./client.js"), exports);
-tslib_1.__exportStar(require("./response.js"), exports);
+tslib_1.__exportStar(require("./client-request.js"), exports);
 tslib_1.__exportStar(require("./types.js"), exports);
-tslib_1.__exportStar(require("./services/collection-service.js"), exports);
-tslib_1.__exportStar(require("./services/singleton-service.js"), exports);
+tslib_1.__exportStar(require("./client-error.js"), exports);
+tslib_1.__exportStar(require("./services/collection-node.js"), exports);
+tslib_1.__exportStar(require("./services/singleton-node.js"), exports);
+tslib_1.__exportStar(require("./requests/batch-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-create-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-delete-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-delete-many-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-get-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-search-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-update-request.js"), exports);
+tslib_1.__exportStar(require("./requests/collection-update-many-request.js"), exports);
+tslib_1.__exportStar(require("./requests/singleton-get-request.js"), exports);

package/cjs/requests/batch-request.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BatchRequest = exports.CRLF = void 0;
+const tslib_1 = require("tslib");
+const highland_1 = tslib_1.__importDefault(require("highland"));
+const uid_1 = require("uid");
+const common_1 = require("@opra/common");
+const url_1 = require("@opra/url");
+const client_request_js_1 = require("../client-request.js");
+exports.CRLF = '\r\n';
+class BatchRequest// todo
+ extends client_request_js_1.OpraClientRequest {
+    client;
+    requests;
+    options;
+    _results = new WeakMap();
+    _listeners = new Set();
+    constructor(client, requests, send, options = {}) {
+        super(client, send, options);
+        this.client = client;
+        this.requests = requests;
+        this.options = options;
+        requests.forEach(request => {
+            Object.defineProperty(request, '_execute', {
+                writable: true,
+                enumerable: false,
+                configurable: true,
+                value: () => {
+                    return new Promise((resolve, reject) => {
+                        const x = this._results.get(request);
+                        if (x) {
+                            if (x.error)
+                                return reject(x.error);
+                            return resolve(x.response);
+                        }
+                        const callback = (e, r) => {
+                            this._listeners.delete(callback);
+                            if (e)
+                                return reject(e);
+                            resolve(r);
+                        };
+                        this._listeners.add(callback);
+                    });
+                }
+            });
+        });
+    }
+    prepare() {
+        const { boundary, stream } = buildBatchStream(this);
+        const headers = {
+            'Content-Type': 'multipart/mixed;boundary=' + boundary
+        };
+        const url = new url_1.OpraURL(this.client.serviceUrl);
+        url.path.join('/$batch');
+        return {
+            method: 'POST',
+            url: url.address,
+            params: url.searchParams,
+            headers,
+            data: stream
+        };
+    }
+    async _execute() {
+        const req = this.prepare();
+        return this._send(req);
+    }
+}
+exports.BatchRequest = BatchRequest;
+function buildBatchStream(batch) {
+    const chunks = [];
+    let batchIndex = 0;
+    let level = 0;
+    const processBatch = (_batch) => {
+        const boundary = `batch_${++batchIndex}_L${level}_${(0, uid_1.uid)(10)}`;
+        for (const req of _batch.requests) {
+            chunks.push('--' + boundary + exports.CRLF);
+            if (req instanceof BatchRequest) {
+                const contentHeaderIndex = chunks.push('');
+                chunks.push('Content-Transfer-Encoding: binary' + exports.CRLF + exports.CRLF);
+                level++;
+                const subBoundary = processBatch(req);
+                level--;
+                processBatch[contentHeaderIndex] = 'Content-Type: multipart/mixed;boundary=' + subBoundary + exports.CRLF;
+                continue;
+            }
+            const prepared = req.prepare();
+            let s = 'Content-Type: application/http' + exports.CRLF +
+                'Content-Transfer-Encoding: binary' + exports.CRLF +
+                'Content-ID:' + req.id + exports.CRLF +
+                exports.CRLF +
+                (prepared.method || 'GET').toUpperCase() + ' ' + prepared.url + ' HTTP/1.1' + exports.CRLF;
+            const headers = new common_1.HeadersMap(prepared.headers);
+            let data;
+            let contentType = '';
+            if (prepared.data) {
+                if (typeof prepared.data === 'string') {
+                    contentType = 'text/plain; charset=utf-8';
+                    data = prepared.data;
+                }
+                else if (highland_1.default.isStream(prepared.data) || Buffer.isBuffer(prepared.data)) {
+                    data = prepared.data;
+                }
+                else if (typeof prepared.data.stream === 'function') {
+                    contentType = prepared.data.type || 'binary';
+                    data = prepared.data.stream(); // File and Blob
+                }
+                else if (typeof prepared.data === 'object') {
+                    contentType = 'application/json; charset=utf-8';
+                    data = JSON.stringify(prepared.data);
+                }
+                else
+                    throw new TypeError(`Invalid data type ${typeof prepared.data}`);
+            }
+            if (contentType && !headers.has('Content-Type'))
+                headers.set('Content-Type', contentType);
+            headers.forEach((v, k) => {
+                s += k + ': ' + (Array.isArray(v) ? v.join(';') : v) + exports.CRLF;
+            });
+            if (data) {
+                if (typeof data === 'string')
+                    chunks.push(s + exports.CRLF + data + exports.CRLF + exports.CRLF);
+                else {
+                    chunks.push(s + exports.CRLF);
+                    chunks.push(data);
+                    chunks.push(exports.CRLF + exports.CRLF);
+                }
+            }
+            else
+                chunks.push(s + exports.CRLF + exports.CRLF);
+        }
+        chunks.push('--' + boundary + '--' + exports.CRLF);
+        return boundary;
+    };
+    const boundary = processBatch(batch);
+    return { boundary, stream: (0, highland_1.default)(chunks).flatten() };
+}

package/cjs/requests/collection-create-request.js

@@ -1,22 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionCreateRequest = void 0;
-class CollectionCreateRequest {
-    _options;
-    constructor(_options = {}) {
-        this._options = _options;
+const url_1 = require("@opra/url");
+const client_request_js_1 = require("../client-request.js");
+class CollectionCreateRequest extends client_request_js_1.OpraClientRequest {
+    client;
+    resource;
+    data;
+    options;
+    constructor(client, send, resource, data, options = {}) {
+        super(client, send, options);
+        this.client = client;
+        this.resource = resource;
+        this.data = data;
+        this.options = options;
     }
-    omit(...fields) {
-        this._options.omit = fields.flat();
-        return this;
-    }
-    pick(...fields) {
-        this._options.pick = fields.flat();
-        return this;
-    }
-    include(...fields) {
-        this._options.include = fields.flat();
-        return this;
+    prepare() {
+        const url = new url_1.OpraURL(this.client.serviceUrl);
+        url.path.join(this.resource.name);
+        if (this.options.include)
+            url.searchParams.set('$include', this.options.include);
+        if (this.options.pick)
+            url.searchParams.set('$pick', this.options.pick);
+        if (this.options.omit)
+            url.searchParams.set('$omit', this.options.omit);
+        return {
+            method: 'POST',
+            url: url.address,
+            data: this.data,
+            params: url.searchParams
+        };
     }
 }
 exports.CollectionCreateRequest = CollectionCreateRequest;

package/cjs/requests/collection-delete-many-request.js

@@ -1,14 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionDeleteManyRequest = void 0;
-class CollectionDeleteManyRequest {
-    _options;
-    constructor(_options = {}) {
-        this._options = _options;
+const url_1 = require("@opra/url");
+const client_request_js_1 = require("../client-request.js");
+class CollectionDeleteManyRequest extends client_request_js_1.OpraClientRequest {
+    client;
+    resource;
+    options;
+    constructor(client, send, resource, options = {}) {
+        super(client, send, options);
+        this.client = client;
+        this.resource = resource;
+        this.options = options;
     }
-    filter(value) {
-        this._options.filter = value;
-        return this;
+    prepare() {
+        const url = new url_1.OpraURL(this.client.serviceUrl);
+        url.path.join(this.resource.name);
+        if (this.options.filter)
+            url.searchParams.set('$filter', this.options.filter);
+        return {
+            method: 'DELETE',
+            url: url.address,
+            params: url.searchParams
+        };
     }
 }
 exports.CollectionDeleteManyRequest = CollectionDeleteManyRequest;

package/cjs/requests/collection-delete-request.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CollectionDeleteRequest = void 0;
+const url_1 = require("@opra/url");
+const client_request_js_1 = require("../client-request.js");
+class CollectionDeleteRequest extends client_request_js_1.OpraClientRequest {
+    client;
+    resource;
+    keyValue;
+    options;
+    constructor(client, send, resource, keyValue, options = {}) {
+        super(client, send, options);
+        this.client = client;
+        this.resource = resource;
+        this.keyValue = keyValue;
+        this.options = options;
+    }
+    prepare() {
+        const url = new url_1.OpraURL(this.client.serviceUrl);
+        url.path.join(this.resource.name);
+        url.path.get(url.path.size - 1).key = this.keyValue;
+        return {
+            method: 'DELETE',
+            url: url.address,
+            params: url.searchParams
+        };
+    }
+}
+exports.CollectionDeleteRequest = CollectionDeleteRequest;

package/cjs/requests/collection-get-request.js

@@ -1,22 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionGetRequest = void 0;
-class CollectionGetRequest {
-    _options;
-    constructor(_options = {}) {
-        this._options = _options;
+const url_1 = require("@opra/url");
+const client_request_js_1 = require("../client-request.js");
+class CollectionGetRequest extends client_request_js_1.OpraClientRequest {
+    client;
+    resource;
+    keyValue;
+    options;
+    constructor(client, send, resource, keyValue, options = {}) {
+        super(client, send, options);
+        this.client = client;
+        this.resource = resource;
+        this.keyValue = keyValue;
+        this.options = options;
     }
-    omit(...fields) {
-        this._options.omit = fields.flat();
-        return this;
-    }
-    pick(...fields) {
-        this._options.pick = fields.flat();
-        return this;
-    }
-    include(...fields) {
-        this._options.include = fields.flat();
-        return this;
+    prepare() {
+        const url = new url_1.OpraURL(this.client.serviceUrl);
+        url.path.join(this.resource.name);
+        url.path.get(url.path.size - 1).key = this.keyValue;
+        if (this.options.include)
+            url.searchParams.set('$include', this.options.include);
+        if (this.options.pick)
+            url.searchParams.set('$pick', this.options.pick);
+        if (this.options.omit)
+            url.searchParams.set('$omit', this.options.omit);
+        return {
+            method: 'GET',
+            url: url.address,
+            params: url.searchParams
+        };
     }
 }
 exports.CollectionGetRequest = CollectionGetRequest;