Skip to content

use explicit path #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use explicit path #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ACME API client
*/

const util = require('./util');
const util = require('./util.js');


/**
Expand Down
12 changes: 6 additions & 6 deletions src/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

const { createHash } = require('crypto');
const { getPemBodyAsB64u } = require('./crypto');
const { log } = require('./logger');
const HttpClient = require('./http');
const AcmeApi = require('./api');
const verify = require('./verify');
const util = require('./util');
const auto = require('./auto');
const { log } = require('./logger.js');
const HttpClient = require('./http.js');
const AcmeApi = require('./api.js');
const verify = require('./verify.js');
const util = require('./util.js');
const auto = require('./auto.js');


/**
Expand Down
7 changes: 4 additions & 3 deletions src/crypto/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
* @namespace crypto
*/

const net = require('net');
const { promisify } = require('util');
const crypto = require('crypto');
const { Buffer } = require('node:buffer');
const net = require('node:net');
const { promisify } = require('node:util');
const crypto = require('node:crypto');
const jsrsasign = require('jsrsasign');

const generateKeyPair = promisify(crypto.generateKeyPair);
Expand Down
6 changes: 3 additions & 3 deletions src/http.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
*/

const { createHmac, createSign, constants: { RSA_PKCS1_PADDING } } = require('crypto');
const { getJwk } = require('./crypto');
const { log } = require('./logger');
const axios = require('./axios');
const { getJwk } = require('./crypto/index.js');
const { log } = require('./logger.js');
const axios = require('./axios.js');


/**
Expand Down
10 changes: 5 additions & 5 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* acme-client
*/

exports.Client = require('./client');
exports.Client = require('./client.js');


/**
Expand All @@ -28,19 +28,19 @@ exports.directory = {
* Crypto
*/

exports.crypto = require('./crypto');
exports.forge = require('./crypto/forge');
exports.crypto = require('./crypto/index.js');
exports.forge = require('./crypto/forge.js');


/**
* Axios
*/

exports.axios = require('./axios');
exports.axios = require('./axios.js');


/**
* Logger
*/

exports.setLogger = require('./logger').setLogger;
exports.setLogger = require('./logger.js').setLogger;
6 changes: 3 additions & 3 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Utility methods
*/

const dns = require('dns').promises;
const { readCertificateInfo, splitPemChain } = require('./crypto');
const { log } = require('./logger');
const dns = require('node:dns/promises');
const { readCertificateInfo, splitPemChain } = require('./crypto/index.js');
const { log } = require('./logger.js');


/**
Expand Down
7 changes: 4 additions & 3 deletions test/00-pebble.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* Pebble Challenge Test Server tests
*/

const dns = require('dns').promises;
const process = require('node:process');
const dns = require('node:dns/promises');
const { assert } = require('chai');
const { v4: uuid } = require('uuid');
const cts = require('./challtestsrv');
const axios = require('./../src/axios');
const cts = require('./challtestsrv.js');
const axios = require('./../src/axios.js');

const domainName = process.env.ACME_DOMAIN_NAME || 'example.com';
const httpPort = axios.defaults.acmeSettings.httpChallengePort || 80;
Expand Down
4 changes: 2 additions & 2 deletions test/10-http.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
const { assert } = require('chai');
const { v4: uuid } = require('uuid');
const nock = require('nock');
const axios = require('./../src/axios');
const HttpClient = require('./../src/http');
const axios = require('./../src/axios.js');
const HttpClient = require('./../src/http.js');
const pkg = require('./../package.json');


Expand Down
2 changes: 1 addition & 1 deletion test/10-logger.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

const { assert } = require('chai');
const logger = require('./../src/logger');
const logger = require('./../src/logger.js');


describe('logger', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/10-verify.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

const { assert } = require('chai');
const { v4: uuid } = require('uuid');
const cts = require('./challtestsrv');
const verify = require('./../src/verify');
const cts = require('./challtestsrv.js');
const verify = require('./../src/verify.js');

const domainName = process.env.ACME_DOMAIN_NAME || 'example.com';

Expand Down
4 changes: 2 additions & 2 deletions test/20-crypto-legacy.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
const fs = require('fs').promises;
const path = require('path');
const { assert } = require('chai');
const spec = require('./spec');
const forge = require('./../src/crypto/forge');
const spec = require('./spec.js');
const forge = require('./../src/crypto/forge.js');

const cryptoEngines = {
forge
Expand Down
2 changes: 1 addition & 1 deletion test/20-crypto.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const fs = require('fs').promises;
const path = require('path');
const { assert } = require('chai');
const spec = require('./spec');
const spec = require('./spec.js');
const { crypto } = require('./../');

const emptyBodyChain1 = `
Expand Down
7 changes: 4 additions & 3 deletions test/50-client.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* ACME client tests
*/

const process = require('node:process');
const { assert } = require('chai');
const { v4: uuid } = require('uuid');
const cts = require('./challtestsrv');
const getCertIssuers = require('./get-cert-issuers');
const spec = require('./spec');
const cts = require('./challtestsrv.js');
const getCertIssuers = require('./get-cert-issuers.js');
const spec = require('./spec.js');
const acme = require('./../');

const domainName = process.env.ACME_DOMAIN_NAME || 'example.com';
Expand Down
7 changes: 4 additions & 3 deletions test/70-auto.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* ACME client.auto tests
*/

const process = require('node:process');
const { assert } = require('chai');
const { v4: uuid } = require('uuid');
const cts = require('./challtestsrv');
const getCertIssuers = require('./get-cert-issuers');
const spec = require('./spec');
const cts = require('./challtestsrv.js');
const getCertIssuers = require('./get-cert-issuers.js');
const spec = require('./spec.js');
const acme = require('./../');

const domainName = process.env.ACME_DOMAIN_NAME || 'example.com';
Expand Down
3 changes: 2 additions & 1 deletion test/challtestsrv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
* Pebble Challenge Test Server integration
*/

const process = require('node:process');
const { assert } = require('chai');
const axios = require('./../src/axios');
const axios = require('./../src/axios.js');

const apiBaseUrl = process.env.ACME_CHALLTESTSRV_URL || null;

Expand Down
2 changes: 1 addition & 1 deletion test/get-cert-issuers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

const acme = require('./../');
const util = require('./../src/util');
const util = require('./../src/util.js');

const pebbleManagementUrl = process.env.ACME_PEBBLE_MANAGEMENT_URL || null;

Expand Down
11 changes: 6 additions & 5 deletions test/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
* Setup testing
*/

const url = require('url');
const net = require('net');
const fs = require('fs');
const dns = require('dns').promises;
const process = require('node:process');
const url = require('node:url');
const net = require('node:net');
const fs = require('node:fs');
const dns = require('node:dns/promises');
const chai = require('chai');
const chaiAsPromised = require('chai-as-promised');
const axios = require('./../src/axios');
const axios = require('./../src/axios.js');


/**
Expand Down