@nosana/kit 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export * from './config/index.js';
 export * from './errors/NosanaError.js';
 export * from './logger/Logger.js';
 export { JobsProgram } from './programs/JobsProgram.js';
-export type { Job, Market, Run } from './programs/JobsProgram.js';
+export type { Job, Market, Run, JobState, MarketQueueType } from './programs/JobsProgram.js';
 export * from './ipfs/IPFS.js';
 export * from './generated_clients/jobs/index.js';
 export * from 'gill';

package/dist/index.js

@@ -52,7 +52,9 @@ export class NosanaClient {
                 // Only try file/environment loading in Node.js environment
                 if (typeof window === 'undefined') {
                     try {
-                        const { loadKeypairSignerFromFile, loadKeypairSignerFromEnvironment, loadKeypairSignerFromEnvironmentBase58 } = await import('gill/node');
+                        // Use string concatenation to avoid bundler resolving this import at build time
+                        const nodeModule = 'gill' + '/node';
+                        const { loadKeypairSignerFromFile, loadKeypairSignerFromEnvironment, loadKeypairSignerFromEnvironmentBase58 } = await import(nodeModule);
                         // Try to load from file path
                         if (await this.isValidFilePath(wallet)) {
                             try {
@@ -153,5 +155,5 @@ export { JobsProgram } from './programs/JobsProgram.js';
 export * from './ipfs/IPFS.js';
 // Export all generated client types and functions
 export * from './generated_clients/jobs/index.js';
-// Export dependencies
+// Export dependencies 
 export * from 'gill';

package/dist/programs/JobsProgram.d.ts

@@ -3,11 +3,23 @@ import { Address, Account } from 'gill';
 import { NosanaClient } from '../index.js';
 import * as programClient from "../generated_clients/jobs/index.js";
 import { ConvertTypesForDb } from '../utils/index.js';
-export type Job = ConvertTypesForDb<programClient.JobAccountArgs> & {
+export declare enum JobState {
+    QUEUED = 0,
+    RUNNING = 1,
+    COMPLETED = 2,
+    STOPPED = 3
+}
+export declare enum MarketQueueType {
+    JOB_QUEUE = 0,
+    NODE_QUEUE = 1
+}
+export type Job = Omit<ConvertTypesForDb<programClient.JobAccountArgs>, 'state'> & {
     address: Address;
+    state: JobState;
 };
-export type Market = ConvertTypesForDb<programClient.MarketAccountArgs> & {
+export type Market = Omit<ConvertTypesForDb<programClient.MarketAccountArgs>, 'queueType'> & {
     address: Address;
+    queueType: MarketQueueType;
 };
 export type Run = ConvertTypesForDb<programClient.RunAccountArgs> & {
     address: Address;
@@ -36,7 +48,7 @@ export declare class JobsProgram extends BaseProgram {
     * Fetch all job accounts
     */
     all(filters?: {
-        state?: number;
+        state?: JobState;
         market?: Address;
         node?: Address;
         project?: Address;

package/dist/programs/JobsProgram.js

@@ -6,6 +6,18 @@ import { findAssociatedTokenPda, TOKEN_PROGRAM_ADDRESS } from '@solana-program/t
 import bs58 from 'bs58';
 import { IPFS } from '../ipfs/IPFS.js';
 import { convertBigIntToNumber } from '../utils/index.js';
+export var JobState;
+(function (JobState) {
+    JobState[JobState["QUEUED"] = 0] = "QUEUED";
+    JobState[JobState["RUNNING"] = 1] = "RUNNING";
+    JobState[JobState["COMPLETED"] = 2] = "COMPLETED";
+    JobState[JobState["STOPPED"] = 3] = "STOPPED";
+})(JobState || (JobState = {}));
+export var MarketQueueType;
+(function (MarketQueueType) {
+    MarketQueueType[MarketQueueType["JOB_QUEUE"] = 0] = "JOB_QUEUE";
+    MarketQueueType[MarketQueueType["NODE_QUEUE"] = 1] = "NODE_QUEUE";
+})(MarketQueueType || (MarketQueueType = {}));
 export class JobsProgram extends BaseProgram {
     constructor(sdk) {
         super(sdk);
@@ -21,12 +33,12 @@ export class JobsProgram extends BaseProgram {
         try {
             const jobAccount = await this.client.fetchJobAccount(this.sdk.solana.rpc, addr);
             const job = this.transformJobAccount(jobAccount);
-            if (checkRun && job.state === 0) {
+            if (checkRun && job.state === JobState.QUEUED) {
                 // If job is queued, check if there is a run account for the job
                 const runs = await this.runs({ job: job.address });
                 if (runs.length > 0) {
                     const run = runs[0];
-                    job.state = 1;
+                    job.state = JobState.RUNNING;
                     job.timeStart = run.time;
                     job.node = run.node;
                 }
@@ -77,10 +89,10 @@ export class JobsProgram extends BaseProgram {
             if (checkRuns) {
                 const runs = await this.runs();
                 jobs.forEach(job => {
-                    if (job.state === 0) {
+                    if (job.state === JobState.QUEUED) {
                         const run = runs.find(run => run.job === job.address);
                         if (run) {
-                            job.state = 1;
+                            job.state = JobState.RUNNING;
                             job.timeStart = run.time;
                             job.node = run.node;
                         }
@@ -168,10 +180,10 @@ export class JobsProgram extends BaseProgram {
             if (checkRuns) {
                 const runs = await this.runs();
                 jobs.forEach(job => {
-                    if (job.state === 0) {
+                    if (job.state === JobState.QUEUED) {
                         const run = runs.find(run => run.job === job.address);
                         if (run) {
-                            job.state = 1;
+                            job.state = JobState.RUNNING;
                             job.timeStart = run.time;
                             job.node = run.node;
                         }
@@ -454,11 +466,13 @@ export class JobsProgram extends BaseProgram {
     transformJobAccount(jobAccount) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars 
         const { discriminator: _, ...jobAccountData } = jobAccount.data;
+        const converted = convertBigIntToNumber(jobAccountData);
         return {
             address: jobAccount.address,
-            ...convertBigIntToNumber(jobAccountData),
+            ...converted,
             ipfsJob: IPFS.solHashToIpfsHash(jobAccountData.ipfsJob),
             ipfsResult: IPFS.solHashToIpfsHash(jobAccountData.ipfsResult),
+            state: converted.state,
         };
     }
     transformRunAccount(runAccount) {
@@ -472,9 +486,11 @@ export class JobsProgram extends BaseProgram {
     transformMarketAccount(marketAccount) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars 
         const { discriminator: _, ...marketAccountData } = marketAccount.data;
+        const converted = convertBigIntToNumber(marketAccountData);
         return {
             address: marketAccount.address,
-            ...convertBigIntToNumber(marketAccountData),
+            ...converted,
+            queueType: converted.queueType,
         };
     }
     /**

package/dist/solana/SolanaUtils.js

@@ -1,4 +1,4 @@
-import { createSolanaClient, address, getProgramDerivedAddress, getAddressEncoder, generateKeyPairSigner, createTransaction, signTransactionMessageWithSigners, getExplorerLink, getSignatureFromTransaction } from 'gill';
+import { createSolanaClient, address, getProgramDerivedAddress, getAddressEncoder, createTransaction, signTransactionMessageWithSigners, getExplorerLink, getSignatureFromTransaction } from 'gill';
 import { NosanaError, ErrorCodes } from '../errors/NosanaError.js';
 export class SolanaUtils {
     constructor(sdk) {
@@ -32,9 +32,6 @@ export class SolanaUtils {
         }
     }
     async getLatestBlockhash() {
-        console.log('testing gen key..');
-        const jobKey = await generateKeyPairSigner();
-        console.log('test', jobKey);
         try {
             const { value: blockhash } = await this.rpc.getLatestBlockhash().send();
             return blockhash;

package/examples/browser/.gitlab-ci.yml

@@ -6,8 +6,8 @@ include:
 
 variables:
   NODE_VERSION: 22
-  OUTPUT_DIR: examples/browser/.output/public
-  PURGE_FILE: examples/browser/purge.json
+  OUTPUT_DIR: .output/public
+  PURGE_FILE: purge.json
 
 .npm:
   image: node:$NODE_VERSION
@@ -42,9 +42,9 @@ pages:
       then
         apt update
         apt install -y jq
-        find $OUTPUT_DIR -type f | sed "s/${OUTPUT_DIR//\//\\/}/https:\/\/$FQDN/g" | jq -R -s -c 'split("\n")[:-1]' > $PURGE_FILE
+        find $OUTPUT_DIR -type f | sed "s/${OUTPUT_DIR//\//\\/}/https:\/\/$FQDN/g" | jq -R -s -c 'split("\n")[:-1]' > ../../$PURGE_FILE
       fi
-    - mv $OUTPUT_DIR public
+    - mv $OUTPUT_DIR ../../public
   artifacts:
     paths:
       - public

package/examples/browser/nuxt.config.ts

@@ -16,9 +16,15 @@ export default defineNuxtConfig({
     define: {
       global: 'globalThis',
     },
+    resolve: {
+      alias: {
+        // Force gill to use browser build instead of node build
+        'gill/node': 'gill/browser',
+      }
+    },
     optimizeDeps: {
       include: ['@nosana/kit'],
-      exclude: ['gill/node', 'gill']
+      exclude: ['gill/node']
     },
   }
 })