wyvrnpm 1.2.1 → 1.3.2

package/src/providers/index.js

@@ -1,43 +1,43 @@
-'use strict';
-
-const S3Provider = require('./s3');
-const HttpProvider = require('./http');
-const FileProvider = require('./file');
-
-/**
- * Ordered list of providers. Detection runs top-to-bottom; first match wins.
- * Add new providers here (or call registerProvider() at runtime).
- */
-const PROVIDERS = [
-  S3Provider,   // must come before HttpProvider — S3 HTTPS URLs also match http://
-  HttpProvider,
-  FileProvider, // local paths and SMB UNC shares (\\server\share or //server/share)
-];
-
-/**
- * Return an instantiated provider that can handle the given source string.
- * @param {string} source
- * @returns {import('./base')}
- */
-function getProvider(source) {
-  for (const Provider of PROVIDERS) {
-    if (Provider.canHandle(source)) {
-      return new Provider();
-    }
-  }
-  throw new Error(
-    `No provider found for source: "${source}"\n` +
-      'Supported schemes: s3://, http://, https://, file://, local path, \\\\server\\share (SMB)',
-  );
-}
-
-/**
- * Register a custom provider at the front of the detection list
- * (giving it higher priority than built-ins).
- * @param {typeof import('./base')} Provider
- */
-function registerProvider(Provider) {
-  PROVIDERS.unshift(Provider);
-}
-
-module.exports = { getProvider, registerProvider, PROVIDERS };
+'use strict';
+
+const S3Provider = require('./s3');
+const HttpProvider = require('./http');
+const FileProvider = require('./file');
+
+/**
+ * Ordered list of providers. Detection runs top-to-bottom; first match wins.
+ * Add new providers here (or call registerProvider() at runtime).
+ */
+const PROVIDERS = [
+  S3Provider,   // must come before HttpProvider — S3 HTTPS URLs also match http://
+  HttpProvider,
+  FileProvider, // local paths and SMB UNC shares (\\server\share or //server/share)
+];
+
+/**
+ * Return an instantiated provider that can handle the given source string.
+ * @param {string} source
+ * @returns {import('./base')}
+ */
+function getProvider(source) {
+  for (const Provider of PROVIDERS) {
+    if (Provider.canHandle(source)) {
+      return new Provider();
+    }
+  }
+  throw new Error(
+    `No provider found for source: "${source}"\n` +
+      'Supported schemes: s3://, http://, https://, file://, local path, \\\\server\\share (SMB)',
+  );
+}
+
+/**
+ * Register a custom provider at the front of the detection list
+ * (giving it higher priority than built-ins).
+ * @param {typeof import('./base')} Provider
+ */
+function registerProvider(Provider) {
+  PROVIDERS.unshift(Provider);
+}
+
+module.exports = { getProvider, registerProvider, PROVIDERS };

package/src/providers/s3.js

@@ -1,136 +1,136 @@
-'use strict';
-
-const fs = require('fs');
-const BaseProvider = require('./base');
-
-// Matches:  s3://bucket/...
-const RE_S3_URI = /^s3:\/\//;
-// Matches:  https://bucket.s3.amazonaws.com/...  or  https://bucket.s3.us-east-1.amazonaws.com/...
-const RE_S3_VIRTUAL_HOSTED = /^https?:\/\/([^.]+)\.s3[.-][^/]*\.amazonaws\.com/;
-// Matches:  https://s3.amazonaws.com/bucket/...  or  https://s3.us-east-1.amazonaws.com/bucket/...
-const RE_S3_PATH_STYLE = /^https?:\/\/s3[.-][^/]*\.amazonaws\.com\/([^/]+)/;
-
-class S3Provider extends BaseProvider {
-  static canHandle(source) {
-    return (
-      RE_S3_URI.test(source) ||
-      RE_S3_VIRTUAL_HOSTED.test(source) ||
-      RE_S3_PATH_STYLE.test(source)
-    );
-  }
-
-  static get providerName() {
-    return 'S3';
-  }
-
-  /** Parse source into { bucket, prefix }. prefix has no leading/trailing slashes. */
-  _parseSource(source) {
-    if (RE_S3_URI.test(source)) {
-      const rest = source.slice(5); // strip "s3://"
-      const slash = rest.indexOf('/');
-      if (slash === -1) return { bucket: rest, prefix: '' };
-      return {
-        bucket: rest.slice(0, slash),
-        prefix: rest.slice(slash + 1).replace(/\/$/, ''),
-      };
-    }
-
-    const url = new URL(source);
-    const vhMatch = url.hostname.match(/^([^.]+)\.s3/);
-    if (vhMatch) {
-      return { bucket: vhMatch[1], prefix: url.pathname.slice(1).replace(/\/$/, '') };
-    }
-
-    // path-style: first path segment is the bucket
-    const parts = url.pathname.slice(1).split('/');
-    return {
-      bucket: parts[0],
-      prefix: parts.slice(1).join('/').replace(/\/$/, ''),
-    };
-  }
-
-  async exists(options) {
-    let S3Client, HeadObjectCommand, fromSSO;
-    try {
-      ({ S3Client, HeadObjectCommand } = require('@aws-sdk/client-s3'));
-      ({ fromSSO } = require('@aws-sdk/credential-providers'));
-    } catch {
-      throw new Error(
-        'AWS SDK packages are required for S3 publishing.\n' +
-          'Run: npm install @aws-sdk/client-s3 @aws-sdk/credential-providers',
-      );
-    }
-
-    const { source, platform, name, version, profile } = options;
-    const { bucket, prefix } = this._parseSource(source);
-    const key = [prefix, platform, name, version, 'wyvrn.json'].filter(Boolean).join('/');
-
-    const clientConfig = profile ? { credentials: fromSSO({ profile }) } : {};
-    const client = new S3Client(clientConfig);
-    try {
-      await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
-      return true;
-    } catch (err) {
-      if (err.name === 'NotFound' || err.$metadata?.httpStatusCode === 404) return false;
-      throw err;
-    }
-  }
-
-  async publish(files, options) {
-    // Lazy-load AWS SDK so the tool works without it when only HTTP is used.
-    let S3Client, PutObjectCommand, fromSSO;
-    try {
-      ({ S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'));
-      ({ fromSSO } = require('@aws-sdk/credential-providers'));
-    } catch {
-      throw new Error(
-        'AWS SDK packages are required for S3 publishing.\n' +
-          'Run: npm install @aws-sdk/client-s3 @aws-sdk/credential-providers',
-      );
-    }
-
-    const { source, platform, name, version, profile } = options;
-    const { bucket, prefix } = this._parseSource(source);
-
-    // Destination key base:  [prefix/]platform/name/version
-    const keyBase = [prefix, platform, name, version].filter(Boolean).join('/');
-    // Package root (without version) for latest.json
-    const packageBase = [prefix, platform, name].filter(Boolean).join('/');
-
-    const clientConfig = profile ? { credentials: fromSSO({ profile }) } : {};
-    const client = new S3Client(clientConfig);
-
-    await this._put(client, bucket, `${keyBase}/wyvrn.json`, files.manifest, 'application/json', PutObjectCommand);
-    await this._put(client, bucket, `${keyBase}/wyvrn.zip`, files.zip, 'application/zip', PutObjectCommand);
-
-    // Write latest.json at the package root so consumers can resolve "latest"
-    const latestContent = Buffer.from(JSON.stringify({ version }));
-    await this._putBuffer(client, bucket, `${packageBase}/latest.json`, latestContent, 'application/json', PutObjectCommand);
-  }
-
-  async _put(client, bucket, key, filePath, contentType, PutObjectCommand) {
-    console.log(`[wyvrn]   → s3://${bucket}/${key}`);
-    await client.send(
-      new PutObjectCommand({
-        Bucket: bucket,
-        Key: key,
-        Body: fs.readFileSync(filePath),
-        ContentType: contentType,
-      }),
-    );
-  }
-
-  async _putBuffer(client, bucket, key, content, contentType, PutObjectCommand) {
-    console.log(`[wyvrn]   → s3://${bucket}/${key}`);
-    await client.send(
-      new PutObjectCommand({
-        Bucket: bucket,
-        Key: key,
-        Body: content,
-        ContentType: contentType,
-      }),
-    );
-  }
-}
-
-module.exports = S3Provider;
+'use strict';
+
+const fs = require('fs');
+const BaseProvider = require('./base');
+
+// Matches:  s3://bucket/...
+const RE_S3_URI = /^s3:\/\//;
+// Matches:  https://bucket.s3.amazonaws.com/...  or  https://bucket.s3.us-east-1.amazonaws.com/...
+const RE_S3_VIRTUAL_HOSTED = /^https?:\/\/([^.]+)\.s3[.-][^/]*\.amazonaws\.com/;
+// Matches:  https://s3.amazonaws.com/bucket/...  or  https://s3.us-east-1.amazonaws.com/bucket/...
+const RE_S3_PATH_STYLE = /^https?:\/\/s3[.-][^/]*\.amazonaws\.com\/([^/]+)/;
+
+class S3Provider extends BaseProvider {
+  static canHandle(source) {
+    return (
+      RE_S3_URI.test(source) ||
+      RE_S3_VIRTUAL_HOSTED.test(source) ||
+      RE_S3_PATH_STYLE.test(source)
+    );
+  }
+
+  static get providerName() {
+    return 'S3';
+  }
+
+  /** Parse source into { bucket, prefix }. prefix has no leading/trailing slashes. */
+  _parseSource(source) {
+    if (RE_S3_URI.test(source)) {
+      const rest = source.slice(5); // strip "s3://"
+      const slash = rest.indexOf('/');
+      if (slash === -1) return { bucket: rest, prefix: '' };
+      return {
+        bucket: rest.slice(0, slash),
+        prefix: rest.slice(slash + 1).replace(/\/$/, ''),
+      };
+    }
+
+    const url = new URL(source);
+    const vhMatch = url.hostname.match(/^([^.]+)\.s3/);
+    if (vhMatch) {
+      return { bucket: vhMatch[1], prefix: url.pathname.slice(1).replace(/\/$/, '') };
+    }
+
+    // path-style: first path segment is the bucket
+    const parts = url.pathname.slice(1).split('/');
+    return {
+      bucket: parts[0],
+      prefix: parts.slice(1).join('/').replace(/\/$/, ''),
+    };
+  }
+
+  async exists(options) {
+    let S3Client, HeadObjectCommand, fromSSO;
+    try {
+      ({ S3Client, HeadObjectCommand } = require('@aws-sdk/client-s3'));
+      ({ fromSSO } = require('@aws-sdk/credential-providers'));
+    } catch {
+      throw new Error(
+        'AWS SDK packages are required for S3 publishing.\n' +
+          'Run: npm install @aws-sdk/client-s3 @aws-sdk/credential-providers',
+      );
+    }
+
+    const { source, platform, name, version, profile } = options;
+    const { bucket, prefix } = this._parseSource(source);
+    const key = [prefix, platform, name, version, 'wyvrn.json'].filter(Boolean).join('/');
+
+    const clientConfig = profile ? { credentials: fromSSO({ profile }) } : {};
+    const client = new S3Client(clientConfig);
+    try {
+      await client.send(new HeadObjectCommand({ Bucket: bucket, Key: key }));
+      return true;
+    } catch (err) {
+      if (err.name === 'NotFound' || err.$metadata?.httpStatusCode === 404) return false;
+      throw err;
+    }
+  }
+
+  async publish(files, options) {
+    // Lazy-load AWS SDK so the tool works without it when only HTTP is used.
+    let S3Client, PutObjectCommand, fromSSO;
+    try {
+      ({ S3Client, PutObjectCommand } = require('@aws-sdk/client-s3'));
+      ({ fromSSO } = require('@aws-sdk/credential-providers'));
+    } catch {
+      throw new Error(
+        'AWS SDK packages are required for S3 publishing.\n' +
+          'Run: npm install @aws-sdk/client-s3 @aws-sdk/credential-providers',
+      );
+    }
+
+    const { source, platform, name, version, profile } = options;
+    const { bucket, prefix } = this._parseSource(source);
+
+    // Destination key base:  [prefix/]platform/name/version
+    const keyBase = [prefix, platform, name, version].filter(Boolean).join('/');
+    // Package root (without version) for latest.json
+    const packageBase = [prefix, platform, name].filter(Boolean).join('/');
+
+    const clientConfig = profile ? { credentials: fromSSO({ profile }) } : {};
+    const client = new S3Client(clientConfig);
+
+    await this._put(client, bucket, `${keyBase}/wyvrn.json`, files.manifest, 'application/json', PutObjectCommand);
+    await this._put(client, bucket, `${keyBase}/wyvrn.zip`, files.zip, 'application/zip', PutObjectCommand);
+
+    // Write latest.json at the package root so consumers can resolve "latest"
+    const latestContent = Buffer.from(JSON.stringify({ version }));
+    await this._putBuffer(client, bucket, `${packageBase}/latest.json`, latestContent, 'application/json', PutObjectCommand);
+  }
+
+  async _put(client, bucket, key, filePath, contentType, PutObjectCommand) {
+    console.log(`[wyvrn]   → s3://${bucket}/${key}`);
+    await client.send(
+      new PutObjectCommand({
+        Bucket: bucket,
+        Key: key,
+        Body: fs.readFileSync(filePath),
+        ContentType: contentType,
+      }),
+    );
+  }
+
+  async _putBuffer(client, bucket, key, content, contentType, PutObjectCommand) {
+    console.log(`[wyvrn]   → s3://${bucket}/${key}`);
+    await client.send(
+      new PutObjectCommand({
+        Bucket: bucket,
+        Key: key,
+        Body: content,
+        ContentType: contentType,
+      }),
+    );
+  }
+}
+
+module.exports = S3Provider;