@storecraft/storage-google 1.0.1 → 1.0.3

package/README.md

@@ -2,7 +2,7 @@
 
 <div style="text-align:center">
   <img src='https://storecraft.app/storecraft-color.svg' 
-       width='90%'' />
+       width='90%' />
 </div><hr/><br/>
 
 `fetch` ready support for an `GCP` **Storage**
@@ -49,6 +49,43 @@ console.log('presign GET url ', url);
 
 ```
 
+## In Storecraft App
+
+```js
+import { App } from '@storecraft/core';
+import { MongoDB, migrateToLatest } from '@storecraft/database-mongodb';
+import { NodePlatform } from '@storecraft/core/platform/node';
+import { GoogleStorage } from '@storecraft/storage-google';
+
+const app = new App(
+  {
+    storage_rewrite_urls: undefined,
+    general_store_name: 'Wush Wush Games',
+    general_store_description: 'We sell cool retro video games',
+    general_store_website: 'https://wush.games',
+    auth_secret_access_token: process.env.auth_secret_access_token,
+    auth_secret_refresh_token: process.env.auth_secret_refresh_token
+    auth_admins_emails: ['jonny@begood.com']
+  }
+)
+.withPlatform(new NodePlatform())
+.withDatabase(new MongoDB())
+.withStorage(
+  new GoogleStorage(
+    {
+      bucket: process.env.GS_BUCKET, 
+      client_email: process.env.GS_CLIENT_EMAIL, 
+      private_key: process.env.GS_PRIVATE_KEY, 
+      private_key_id: process.env.GS_PRIVATE_KEY_ID
+    }
+  )
+);
+  
+await app.init();
+await migrateToLatest(app.db, false);
+
+```
+
 
 ```text
 Author: Tomer Shalev (tomer.shalev@gmail.com)

package/adapter.js

@@ -29,8 +29,8 @@ const infer_content_type = (name) => {
  */
 
 /**
- * Google Storage
- * @typedef {import('@storecraft/core/v-storage').storage_driver} storage
+ * @description Google Storage adapter
+ * @typedef {import('@storecraft/core/storage').storage_driver} storage
  * 
  * @implements {storage}
  */
@@ -66,7 +66,7 @@ export class GoogleStorage {
   }
 
   features() {
-    /** @type {import('@storecraft/core/v-storage').StorageFeatures} */
+    /** @type {import('@storecraft/core/storage').StorageFeatures} */
     const f = {
       supports_signed_urls: true
     }
@@ -101,6 +101,7 @@ export class GoogleStorage {
           Authorization: auth,
           'Content-Type': 'image/png'
         },
+        // @ts-ignore
         duplex: 'half'
       }
     );
@@ -273,8 +274,9 @@ export class GoogleStorage {
       }
     );
 
+    // console.log(await r.text())
+
     return r.ok;
-    // console.log(r)
   }
 }
 

package/adapter.utils.js

@@ -1,4 +1,4 @@
-import { base64, jwt } from '@storecraft/core/v-crypto';
+import { base64, jwt } from '@storecraft/core/crypto';
 
 /**
  * 
@@ -7,7 +7,7 @@ import { base64, jwt } from '@storecraft/core/v-crypto';
  * @returns 
  */
 export async function getJWTFromServiceAccount(sf, aud=undefined) {
-  /** @type {Partial<import('@storecraft/core/v-crypto').jwt.JWTClaims> & Record<string, string>} */
+  /** @type {Partial<import('@storecraft/core/crypto').jwt.JWTClaims> & Record<string, string>} */
   const claims = {
     scope: [
       // 'https://www.googleapis.com/auth/cloud-platform',

package/jsconfig.json

@@ -3,6 +3,7 @@
     "checkJs": true,
     "target": "ESNext",
     "moduleResolution": "NodeNext",
+    "maxNodeModuleJsDepth": 10,
     "module": "NodeNext",
     "composite": true,
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/storage-google",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Official Google Storage adapter for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/store-craft/storecraft.git",
-    "directory": "packages/storage-google"
+    "directory": "packages/storage/storage-google"
   },
   "keywords": [
     "commerce",
@@ -18,13 +18,14 @@
   ],
   "scripts": {
     "storage-google:test": "uvu -c",
-    "storage-google:publish": "npm publish --access public"
+    "test": "npm run storage-google:test",
+    "prepublishOnly": "npm version patch --force"
   },
   "type": "module",
   "main": "adapter.js",
   "types": "types.public.d.ts",
   "dependencies": {
-    "@storecraft/core": "^1.0.0"
+    "@storecraft/core": "^1.0.11"
   },
   "devDependencies": {
     "@types/node": "^20.11.0",

package/tests/storage.test.js

@@ -3,6 +3,7 @@ import { test } from 'uvu';
 import * as assert from 'uvu/assert';
 import { GoogleStorage } from '@storecraft/storage-google'
 import { readFile } from 'node:fs/promises';
+import { storage as storage_test_runner } from '@storecraft/core/test-runner'
 
 const areBlobsEqual = async (blob1, blob2) => {
   return !Buffer.from(await blob1.arrayBuffer()).compare(
@@ -15,16 +16,18 @@ const storage = new GoogleStorage({
   private_key: process.env.GS_PRIVATE_KEY, private_key_id: process.env.GS_PRIVATE_KEY_ID
 });
 
-test.before(async () => { await storage.init(undefined) });
+const suite = storage_test_runner.create(storage);
 
-test('blob put/get/delete', async () => {
+suite.before(async () => { await storage.init(undefined) });
+
+suite('blob put/get/delete', async () => {
   const data = [
     // {
     //   key: 'folder1/tomer.txt',
     //   blob: new Blob(['this is some text from tomer :)']),
     // },
     {
-      key: 'node2222.png',
+      key: 'folder2/node2222.png',
       blob: new Blob([await readFile('./node.png')])
     }
   ];
@@ -49,14 +52,14 @@ test('blob put/get/delete', async () => {
   
 });
 
-test('blob put (presign)', async () => {
+suite('blob put (presign)', async () => {
   const data = [
     // {
     //   key: 'folder1/tomer.txt',
     //   blob: new Blob(['this is some text from tomer :)']),
     // },
     {
-      key: 'node_test2.png',
+      key: 'folder2/node_test2.png',
       blob: new Blob([await readFile('./node.png')])
     }
   ];
@@ -82,4 +85,4 @@ test('blob put (presign)', async () => {
   
 });
 
-test.run();
+suite.run();