@xandeum/web3.js 1.6.0 → 1.9.0

package/README.md

@@ -38,7 +38,8 @@ import {
 import {
   Connection,
   sendAndConfirmTransaction,
-  Keypair
+  Keypair,
+  PublicKey
 } from '@solana/web3.js'
 
 const connection = new Connection('https://apis.devnet.xandeum.com)
@@ -54,6 +55,8 @@ async function main() {
   const tx2 = await createFile('1', '/','hello.txt', wallet)
   await sendAndConfirmTransaction(connection, tx2, [signer])
 
+  const dataAccount = new PublicKey("FBM4G63KPUneqyLwQy6zVu81AsMqmkQjsdxNGBKq3dkv");
+  
   // Write data
   const tx3 = await poke('1', '/hello.txt', 0, Buffer.from('Hello Xandeum!'), wallet)
   await sendAndConfirmTransaction(connection, tx3, [signer])

package/dist/exists.js

@@ -51,7 +51,7 @@ exports.exists = exists;
  */
 function exists(connection, path) {
     return __awaiter(this, void 0, void 0, function () {
-        var url, requestBody, response, data;
+        var url, requestBody, response, errorText, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -71,11 +71,13 @@ function exists(connection, path) {
                         })];
                 case 1:
                     response = _a.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! Status: ".concat(response.status));
-                    }
-                    return [4 /*yield*/, response.json()];
+                    if (!!response.ok) return [3 /*break*/, 3];
+                    return [4 /*yield*/, response.text()];
                 case 2:
+                    errorText = _a.sent();
+                    return [2 /*return*/, Error("error! status: ".concat(response.status, ", message: ").concat(errorText))];
+                case 3: return [4 /*yield*/, response.json()];
+                case 4:
                     data = _a.sent();
                     return [2 /*return*/, data];
             }

package/dist/getMetadata.js

@@ -54,7 +54,7 @@ exports.getMetadata = getMetadata;
  */
 function getMetadata(connection, path) {
     return __awaiter(this, void 0, void 0, function () {
-        var url, requestBody, response, data;
+        var url, requestBody, response, errorText, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -74,11 +74,13 @@ function getMetadata(connection, path) {
                         })];
                 case 1:
                     response = _a.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! Status: ".concat(response.status));
-                    }
-                    return [4 /*yield*/, response.json()];
+                    if (!!response.ok) return [3 /*break*/, 3];
+                    return [4 /*yield*/, response.text()];
                 case 2:
+                    errorText = _a.sent();
+                    return [2 /*return*/, Error("error! status: ".concat(response.status, ", message: ").concat(errorText))];
+                case 3: return [4 /*yield*/, response.json()];
+                case 4:
                     data = _a.sent();
                     return [2 /*return*/, data];
             }

package/dist/listDirectoryEntery.js

@@ -52,7 +52,7 @@ exports.listDirectoryEntry = listDirectoryEntry;
  */
 function listDirectoryEntry(connection, path) {
     return __awaiter(this, void 0, void 0, function () {
-        var url, requestBody, response, data;
+        var url, requestBody, response, errorText, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -72,11 +72,13 @@ function listDirectoryEntry(connection, path) {
                         })];
                 case 1:
                     response = _a.sent();
-                    if (!response.ok) {
-                        throw new Error("HTTP error! Status: ".concat(response.status));
-                    }
-                    return [4 /*yield*/, response.json()];
+                    if (!!response.ok) return [3 /*break*/, 3];
+                    return [4 /*yield*/, response.text()];
                 case 2:
+                    errorText = _a.sent();
+                    return [2 /*return*/, Error("error! status: ".concat(response.status, ", message: ").concat(errorText))];
+                case 3: return [4 /*yield*/, response.json()];
+                case 4:
                     data = _a.sent();
                     return [2 /*return*/, data];
             }

package/dist/move.d.ts

@@ -0,0 +1,14 @@
+import { Transaction, PublicKey } from '@solana/web3.js';
+/**
+ * Constructs a Solana transaction to copy a file or directory from one  path to another.
+ *
+ * @param fsid - The unique numeric identifier representing the target file system.
+ * @param srcPath - The source path to copy from (e.g., `/documents`).
+ * @param destPath - The destination path to copy to (e.g., `/archive`).
+ * @param name - The name of the new file or directory at the destination (e.g., `report.txt`).
+ * @param wallet - The wallet public key used to sign and authorize the transaction.
+ * @returns A Promise that resolves to a Solana `Transaction` object containing the copyPath instruction.
+ * @throws Will throw an error if `srcPath` or `destPath` contains invalid characters.
+ *
+ */
+export declare function move(fsid: string, srcPath: string, destPath: string, name: string, wallet: PublicKey): Promise<Transaction>;

package/dist/move.js

@@ -0,0 +1,88 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.move = move;
+var web3_js_1 = require("@solana/web3.js");
+var bn_js_1 = __importDefault(require("bn.js"));
+var const_1 = require("./const");
+var sanitizePath_1 = require("./sanitizePath");
+/**
+ * Constructs a Solana transaction to copy a file or directory from one  path to another.
+ *
+ * @param fsid - The unique numeric identifier representing the target file system.
+ * @param srcPath - The source path to copy from (e.g., `/documents`).
+ * @param destPath - The destination path to copy to (e.g., `/archive`).
+ * @param name - The name of the new file or directory at the destination (e.g., `report.txt`).
+ * @param wallet - The wallet public key used to sign and authorize the transaction.
+ * @returns A Promise that resolves to a Solana `Transaction` object containing the copyPath instruction.
+ * @throws Will throw an error if `srcPath` or `destPath` contains invalid characters.
+ *
+ */
+function move(fsid, srcPath, destPath, name, wallet) {
+    return __awaiter(this, void 0, void 0, function () {
+        var rest, instructionData, instruction, tx;
+        return __generator(this, function (_a) {
+            // Validate path: only letters, numbers, and /
+            (0, sanitizePath_1.sanitizePath)(srcPath);
+            (0, sanitizePath_1.sanitizePath)(destPath);
+            (0, sanitizePath_1.sanitizePath)(name);
+            rest = Buffer.from("".concat(srcPath, "\0").concat(destPath, "\0").concat(name), 'utf-8');
+            instructionData = Buffer.concat([
+                Buffer.from(Int8Array.from([9]).buffer),
+                Buffer.from(Uint8Array.of.apply(Uint8Array, new bn_js_1.default(fsid).toArray('le', 8))),
+                rest
+            ]);
+            instruction = new web3_js_1.TransactionInstruction({
+                keys: [
+                    {
+                        pubkey: wallet,
+                        isSigner: true,
+                        isWritable: true
+                    }
+                ],
+                programId: new web3_js_1.PublicKey(const_1.programId),
+                data: instructionData
+            });
+            tx = new web3_js_1.Transaction().add(instruction);
+            return [2 /*return*/, tx];
+        });
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xandeum/web3.js",
-  "version": "1.6.0",
+  "version": "1.9.0",
   "description": "Xandeum javascript api",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/exists.ts

@@ -38,7 +38,8 @@ export interface RpcRequest {
   })
 
   if (!response.ok) {
-    throw new Error(`HTTP error! Status: ${response.status}`)
+    const errorText = await response.text(); 
+    return Error(`error! status: ${response.status}, message: ${errorText}`);
   }
 
   const data = await response.json()

package/src/getMetadata.ts

@@ -41,7 +41,8 @@ export async function getMetadata (connection: Connection,path: string): Promise
   })
 
   if (!response.ok) {
-    throw new Error(`HTTP error! Status: ${response.status}`)
+    const errorText = await response.text(); 
+    return Error(`error! status: ${response.status}, message: ${errorText}`);
   }
 
   const data = await response.json()

package/src/listDirectoryEntery.ts

@@ -42,7 +42,8 @@ export async function listDirectoryEntry (
   })
 
   if (!response.ok) {
-    throw new Error(`HTTP error! Status: ${response.status}`)
+    const errorText = await response.text(); 
+    return Error(`error! status: ${response.status}, message: ${errorText}`);
   }
 
   const data = await response.json()

package/src/move.ts

@@ -0,0 +1,55 @@
+import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
+import BN from 'bn.js'
+import { programId } from './const'
+import { sanitizePath } from './sanitizePath'
+
+/**
+ * Constructs a Solana transaction to copy a file or directory from one  path to another.
+ *
+ * @param fsid - The unique numeric identifier representing the target file system.
+ * @param srcPath - The source path to copy from (e.g., `/documents`).
+ * @param destPath - The destination path to copy to (e.g., `/archive`).
+ * @param name - The name of the new file or directory at the destination (e.g., `report.txt`).
+ * @param wallet - The wallet public key used to sign and authorize the transaction.
+ * @returns A Promise that resolves to a Solana `Transaction` object containing the copyPath instruction.
+ * @throws Will throw an error if `srcPath` or `destPath` contains invalid characters.
+ *
+ */
+
+export async function move (
+  fsid: string,
+  srcPath: string,
+  destPath: string,
+  name: string,
+  wallet: PublicKey
+): Promise<Transaction> {
+  // Validate path: only letters, numbers, and /
+  sanitizePath(srcPath)
+
+  sanitizePath(destPath)
+  sanitizePath(name)
+
+
+  const rest = Buffer.from(`${srcPath}\0${destPath}\0${name}`, 'utf-8')
+
+  const instructionData = Buffer.concat([
+    Buffer.from(Int8Array.from([9]).buffer),
+    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
+    rest
+  ])
+
+  const instruction = new TransactionInstruction({
+    keys: [
+      {
+        pubkey: wallet,
+        isSigner: true,
+        isWritable: true
+      }
+    ],
+    programId: new PublicKey(programId),
+    data: instructionData
+  })
+
+  const tx = new Transaction().add(instruction)
+  return tx
+}