@arkstack/filesystem 0.12.24 → 0.12.26

package/dist/commands/StorageLinkCommand.js

@@ -1,4 +1,4 @@
-import { t as Storage } from "../src-DX_iPdpM.js";
+import { t as Storage } from "../src-DNh_3BpA.js";
 import { Command } from "@h3ravel/musket";
 //#region src/commands/StorageLinkCommand.ts
 var StorageLinkCommand = class extends Command {

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { DriveDirectory, DriveFile, DriveManager } from "flydrive";
 import { Readable } from "node:stream";
 import { DriverContract, ObjectMetaData, ObjectVisibility, SignedURLOptions, WriteOptions } from "flydrive/types";
+import { GCSDriverOptions } from "flydrive/drivers/gcs/types";
 
 //#region src/types.d.ts
 interface FileLike {
@@ -9,6 +10,7 @@ interface FileLike {
   mimetype: string;
 }
 interface CustomDiskDriverRegistry {}
+type GcsDiskDriverConfig = GCSDriverOptions;
 interface FtpDriverConfig {
   host: string;
   username: string;
@@ -38,6 +40,7 @@ interface LocalDriverConfig {
   root?: string;
   location?: string | URL;
   visibility: ObjectVisibility;
+  url?: string;
 }
 type CustomDiskConfig = keyof CustomDiskDriverRegistry extends never ? {
   driver: string;
@@ -52,7 +55,7 @@ type DiskConfig = LocalDriverConfig & {
 } | S3DriverConfig & {
   driver: 's3';
 } | CustomDiskConfig;
-type DriverConfig<K extends 'ftp' | 'local' | 's3' | (string & {}) = string & {}> = K extends 'ftp' ? FtpDriverConfig : K extends 's3' ? S3DriverConfig : K extends 'local' ? LocalDriverConfig : K extends keyof CustomDiskDriverRegistry ? CustomDiskDriverRegistry[K] : DiskConfig;
+type DriverConfig<K extends 'ftp' | 'local' | 'gcs' | 's3' | (string & {}) = string & {}> = K extends 'ftp' ? FtpDriverConfig : K extends 's3' ? S3DriverConfig : K extends 'gcs' ? GcsDiskDriverConfig : K extends 'local' ? LocalDriverConfig : K extends keyof CustomDiskDriverRegistry ? CustomDiskDriverRegistry[K] : DiskConfig;
 type KnownDisks = {
   local: LocalDriverConfig & {
     driver: 'local';
@@ -63,12 +66,15 @@ type KnownDisks = {
   ftp: FtpDriverConfig & {
     driver: 'ftp';
   };
+  gcs: GcsDiskDriverConfig & {
+    driver: 'gcs';
+  };
   s3: S3DriverConfig & {
     driver: 's3';
   };
 };
 interface FilesystemConfig {
-  default: 'local' | 'ftp' | 's3' | keyof CustomDiskDriverRegistry | (string & {});
+  default: 'local' | 'ftp' | 'gcs' | 's3' | keyof CustomDiskDriverRegistry | (string & {});
   disks: KnownDisks & CustomDiskDriverRegistry;
   links: Record<string, string>;
   custom_drivers?: Record<keyof CustomDiskDriverRegistry | (string & {}), DriverContract | (new (config?: CustomDiskConfig) => DriverContract)>;
@@ -434,4 +440,4 @@ declare class FtpDriver implements DriverContract {
   }>;
 }
 //#endregion
-export { CustomDiskConfig, CustomDiskDriverRegistry, DiskConfig, DriverConfig, FileLike, FilesystemConfig, FtpDriver, FtpDriverConfig, KnownDisks, LocalDriverConfig, S3DriverConfig, Storage };
+export { CustomDiskConfig, CustomDiskDriverRegistry, DiskConfig, DriverConfig, FileLike, FilesystemConfig, FtpDriver, FtpDriverConfig, GcsDiskDriverConfig, KnownDisks, LocalDriverConfig, S3DriverConfig, Storage };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as FtpDriver, t as Storage } from "./src-DX_iPdpM.js";
+import { n as FtpDriver, t as Storage } from "./src-DNh_3BpA.js";
 export { FtpDriver, Storage };

package/dist/{src-DX_iPdpM.js → src-DNh_3BpA.js}

@@ -5,6 +5,7 @@ import { FSDriver } from "flydrive/drivers/fs";
 import Client from "ssh2-sftp-client";
 import { Readable } from "node:stream";
 import path from "node:path";
+import { GCSDriver } from "flydrive/drivers/gcs";
 import { S3Driver } from "flydrive/drivers/s3";
 import { appUrl, config } from "@arkstack/common";
 import { Logger } from "@h3ravel/shared";
@@ -248,7 +249,8 @@ var Driver = class Driver {
 		if (![
 			"local",
 			"ftp",
-			"s3"
+			"s3",
+			"gcs"
 		].includes(name) && !this.customDrivers.has(name)) throw new Error(`Unsupported driver: ${name}`);
 		const driver = new Driver(config);
 		if (this.customDrivers.has(name)) return driver.custom(name);
@@ -261,9 +263,11 @@ var Driver = class Driver {
 			visibility: config.visibility ?? "public",
 			urlBuilder: {
 				async generateURL(key, _path) {
+					if (config.url) return `${config.url}/key`.replace(/^(https?:\/)\/+/, "$1/").replace(/([^:]\/)\/+/g, "$1");
 					return appUrl(key);
 				},
 				async generateSignedURL(key, _path, _opts) {
+					if (config.url) return `${config.url}/key`.replace(/^(https?:\/)\/+/, "$1/").replace(/([^:]\/)\/+/g, "$1");
 					return appUrl(key);
 				}
 			}
@@ -283,6 +287,10 @@ var Driver = class Driver {
 			cdnUrl: config.cdnUrl ?? config.url
 		});
 	}
+	gcs() {
+		const { driver: _driver, ...options } = this.config;
+		return new GCSDriver(options);
+	}
 	ftp() {
 		const config = this.config;
 		return new FtpDriver({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/filesystem",
-  "version": "0.12.24",
+  "version": "0.12.26",
   "type": "module",
   "description": "Filesystem module for Arkstack, providing shared file storage and filesystem utitlities for the framework.",
   "homepage": "https://arkstack.toneflix.net",
@@ -35,12 +35,13 @@
   },
   "dependencies": {
     "@h3ravel/shared": "^2.1.3",
+    "@google-cloud/storage": "^7.21.0",
     "@aws-sdk/client-s3": "^3.1011.0",
     "@aws-sdk/s3-request-presigner": "^3.1011.0",
     "flydrive": "^2.0.0",
     "ssh2-sftp-client": "^12.1.0",
-    "@arkstack/common": "^0.12.24",
-    "@arkstack/contract": "^0.12.24"
+    "@arkstack/common": "^0.12.26",
+    "@arkstack/contract": "^0.12.26"
   },
   "devDependencies": {
     "@types/ssh2-sftp-client": "^9.0.6"