datomic-client-js 0.1.9 → 0.1.11

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.1.11 (January 9, 2026).
+
+* Update aws-sdk dependency version.
+
 ## 0.1.9 (January 16, 2020).
 
 * Handle EDN strings with template variables properly.
@@ -30,4 +34,4 @@
 
 ## 0.1.3 (January 12, 2020).
 
-* Initial semi-working release.
+* Initial semi-working release.

package/README.md

@@ -23,16 +23,19 @@ let peerConf = {
 
 // cloud config map example
 let cloudConf = {
-    endpoint: 'http://entry.your-system-name.your-region.datomic.net:8182/',
+    endpoint: 'https://your-apigateway-url',
     serverType: 'cloud',
     region: 'your-region',
     system: 'your-system',
-    proxyPort: 8182  // if connecting via the bastion server
+    dbName: 'your-db-name',
 };
+// Can also still set endpoint to a private datomic.net URL,
+// and set proxyPort if using an older Datomic cloud release
+// with a proxy server for access.
 
 let client = require('datomic-client-js');
 
-// List databases
+// List databases, you can omit dbName from config
 client.listDatabases(cloudConf).then((dbs) => `${dbs}`);
 
 // Create database (cloud only)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datomic-client-js",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Client for Datomic Cloud and Peer Server",
   "scripts": {
     "test": "mocha",
@@ -12,16 +12,16 @@
   "author": "Casey Marshall",
   "license": "Apache-2.0",
   "dependencies": {
-    "aws-sdk": "2.599.0",
+    "aws-sdk": "2.1693.0",
+    "jsedn": "~0.4.1",
     "npm": "^6.13.6",
     "socks-proxy-agent": "4.0.2",
     "transit-js": "0.8.861",
-    "uuid": "latest",
-    "jsedn": "~0.4.1"
+    "uuid": "latest"
   },
   "devDependencies": {
-    "promise": "~8.0.3",
-    "jsdoc": "~3.6.3"
+    "jsdoc": "~3.6.3",
+    "promise": "~8.0.3"
   },
   "main": "index.js",
   "repository": {

package/src/channel.js

@@ -44,6 +44,9 @@ Channel.prototype.close = function() {
     this.producers.forEach(p => {
         p[2](false);
     });
+    this.consumers.forEach(c => {
+        c[0](null);
+    });
 };
 
 /**

package/src/cloud.js

@@ -7,6 +7,13 @@ let SocksProxyAgent = require('socks-proxy-agent');
 let transit = require('transit-js');
 let url = require('url');
 
+let debug;
+if (process.env.DATOMIC_CLIENT_JS_DEBUG === 'true') {
+    debug = console.log;
+} else {
+    debug = () => {};
+}
+
 function createAccessKeyIdForType(args) {
     if (args.type === 'admin') {
         return args.prefix + '/' + args.system + '/datomic/access/admin/' + args.keyName;
@@ -72,6 +79,7 @@ function Spi(config, routingMap, agent) {
     this.routingMap = routingMap;
     this._cachedKeys = {};
     this.agent = agent;
+    this.serverType = 'cloud';
 }
 
 Spi.prototype.addRouting = function (request) {
@@ -84,6 +92,7 @@ Spi.prototype.addRouting = function (request) {
 Spi.prototype.getSignParams = function(request, address) {
     let baseKeyId = baseAccessKeyId(this.config, address, request);
     let res = this._cachedKeys[baseKeyId];
+    debug('getSignParams', baseKeyId, res);
     if (res != null) {
         return signParams(this.config, res);
     } else {
@@ -112,6 +121,11 @@ Spi.prototype.getAgent = function () {
     return this.agent;
 };
 
+Spi.prototype.usePrivateTrustAnchor = function () {
+    let u = new url.URL(this.config.endpoint);
+    return u.protocol === 'http:';
+}
+
 let shared = require('./shared');
 function signParams(config, creds) {
     return {
@@ -153,11 +167,12 @@ function parseAccessKeyId(s) {
 }
 
 async function getKeyFile(config, s3url) {
+    debug('getKeyFile', config, s3url);
     let s3 = new aws.S3({region: config.region});
-    let u = url.parse(s3url);
+    let u = new url.URL(s3url);
     let request = {
         Bucket: u.hostname,
-        Key: u.path.replace(/^\/+/, '')
+        Key: u.pathname.replace(/^\/+/, '')
     };
     let result = await s3.getObject(request).promise();
     let reader = transit.reader('json');
@@ -169,7 +184,8 @@ const DEFAULT_HTTPS_PORT = 443;
 
 function parseEndpoint(s) {
     if (s != null) {
-        let uri = url.parse(s);
+        let uri = new url.URL(s);
+        debug('parseEndpoint', s, uri);
         let protocol;
         if (uri.protocol === 'http:') {
             protocol = 'http';
@@ -177,10 +193,10 @@ function parseEndpoint(s) {
             protocol = 'https';
         }
         let port = uri.port;
-        if (port == null) {
-            if (uri.protocol === 'http') {
+        if (port == null || port === '') {
+            if (uri.protocol === 'http:') {
                 port = DEFAULT_HTTP_PORT;
-            } else if (uri.protocol === 'https') {
+            } else if (uri.protocol === 'https:') {
                 port = DEFAULT_HTTPS_PORT;
             }
         } else {
@@ -237,6 +253,7 @@ function getS3AuthPath(request, agent) {
 }
 
 async function createSpi(args) {
+    debug('createSpi', args);
     args = Object.assign({}, args, {endpointMap: parseEndpoint(args.endpoint)});
     let agent = null;
     if (args.proxyPort != null) {
@@ -247,6 +264,7 @@ async function createSpi(args) {
         });
     }
     let s3Path = await getS3AuthPath(Object.assign({}, args.endpointMap,{method: 'get', path: '/'}), agent);
+    debug('s3path:', s3Path);
     let spiArgs = Object.assign(args, {s3AuthPath: 's3://' + s3Path});
     spiArgs.endpointMap.path = '/api';
     return new Spi(spiArgs, spiArgs.endpointMap, agent);

package/src/pro.js

@@ -19,6 +19,7 @@ function routingMap(endpoint) {
 function Spi(signingMap, routingMap) {
     this.signingMap = signingMap;
     this.routingMap = routingMap;
+    this.serverType = 'peer-server';
 }
 
 Spi.prototype.addRouting = function(request) {
@@ -40,6 +41,10 @@ Spi.prototype.getAgent = function() {
     return null;
 };
 
+Spi.prototype.usePrivateTrustAnchor = function () {
+    return true;
+}
+
 function createSpi(args) {
     if (args.accessKey != null && args.endpoint != null) {
         let routing = routingMap(args.endpoint);

package/src/query.js

@@ -8,6 +8,8 @@ let transit = require('transit-js');
  * specify transit.Keyword and transit.Symbol values in your query,
  * which is verbose and cumbersome.
  *
+ * @deprecated Use EDN template strings instead.
+ *
  * @constructor QueryBuilder
  */
 function QueryBuilder() {

package/src/shared.js

@@ -312,6 +312,17 @@ function Connection(client, state, info, refreshInterval, lastRefresh) {
     this.lastRefresh = lastRefresh;
 }
 
+function get_in(m, ...ks) {
+    let ret = m;
+    for (const k of ks) {
+        ret = ret[k];
+        if (ret == null) {
+            break;
+        }
+    }
+    return ret;
+}
+
 Connection.prototype.advanceT = function(db) {
     let newState = this.state;
     let thisT = this.state.t;
@@ -350,6 +361,10 @@ Connection.prototype.getState = function() {
     return this.state;
 };
 
+Connection.prototype.getServerType = function() {
+    return get_in(this, 'client', 'spi', 'serverType');
+}
+
 /**
  * Sync with the most recent transaction on the server, and return
  * a Db value with that state.
@@ -569,8 +584,10 @@ function doSendWithRetry(httpRequest, requestContext, spi, timeout, signParams,
     let execRequest = function(signParams) {
         let signedRequest = signRequest(httpRequest, signParams);
         signedRequest.timeout = timeout;
-        signedRequest.ca = transactorTrust;
-        signedRequest.checkServerIdentity = function(_, __) {};
+        if (spi.usePrivateTrustAnchor()) {
+            signedRequest.ca = transactorTrust;
+            signedRequest.checkServerIdentity = function(_, __) {};
+        }
         if (spi.getAgent() != null) {
             signedRequest.agent = spi.getAgent();
         }

package/src/tx.js

@@ -6,6 +6,8 @@ let shared = require('./shared.js');
 /**
  * A transaction builder.
  *
+ * @deprecated Use EDN template strings instead.
+ *
  * @constructor TxBuilder
  */
 function TxBuilder() {